[Pkg-gnupg-commit] [gnupg2] 191/205: Imported Upstream version 2.1.12
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed May 11 08:38:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit b6dc537d6e9751b69d897aa5676ec056ed0aa6f0
Merge: c75d9bf 00df5b1
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Tue May 10 20:54:40 2016 -0400
Imported Upstream version 2.1.12
ChangeLog | 1108 ++
INSTALL | 234 -
Makefile.am | 6 +-
Makefile.in | 1040 --
NEWS | 53 +
VERSION | 2 +-
aclocal.m4 | 1481 ---
agent/Makefile.am | 2 +-
agent/Makefile.in | 1287 ---
agent/agent.h | 2 +-
agent/command-ssh.c | 2 +-
agent/command.c | 83 +-
agent/cvt-openpgp.c | 2 +-
agent/findkey.c | 163 +-
agent/genkey.c | 2 +-
agent/gpg-agent.c | 16 +-
agent/protect-tool.c | 117 +-
agent/protect.c | 436 +-
agent/t-protect.c | 2 +-
autogen.rc | 2 +-
build-aux/compile | 347 -
build-aux/config.guess | 143 +-
build-aux/config.rpath | 690 --
build-aux/config.sub | 36 +-
build-aux/depcomp | 791 --
build-aux/install-sh | 527 -
build-aux/missing | 215 -
build-aux/mkinstalldirs | 161 -
build-aux/speedo.mk | 15 +-
build-aux/speedo/patches/sqlite.patch | 42 +
build-aux/speedo/w32/inst.nsi | 288 +-
build-aux/speedo/w32/pkg-copyright.txt | 26 +-
build-aux/texinfo.tex | 8638 ---------------
common/Makefile.am | 8 +-
common/Makefile.in | 2767 -----
common/README | 12 +-
common/argparse.c | 8 +-
common/exechelp-posix.c | 129 +-
common/exechelp-w32.c | 177 +-
common/exechelp-w32ce.c | 18 +
common/exechelp.h | 9 +
common/exectool.c | 27 +-
common/homedir.c | 10 +-
common/iobuf.c | 71 +-
common/iobuf.h | 9 +-
common/logging.c | 50 +-
common/logging.h | 21 +-
common/miscellaneous.c | 11 +
common/openpgpdefs.h | 28 +
common/private-keys.c | 750 ++
common/private-keys.h | 109 +
common/server-help.c | 137 +
common/server-help.h | 62 +
common/sexp-parse.h | 2 +-
common/simple-pwquery.c | 95 +-
common/status-codes.h | 22 +-
common/status.h | 5 +
common/strlist.c | 31 +-
common/strlist.h | 3 +
common/sysutils.c | 73 +-
common/sysutils.h | 1 +
common/t-exechelp.c | 21 +-
common/t-private-keys.c | 541 +
common/t-session-env.c | 15 +-
common/utf8conv.c | 16 +-
common/util.h | 6 +
config.h.in | 920 --
configure | 17631 -------------------------------
configure.ac | 98 +-
dirmngr/Makefile.am | 6 +-
dirmngr/Makefile.in | 1371 ---
dirmngr/dirmngr-client.c | 43 +-
dirmngr/dns-stuff.c | 24 +-
dirmngr/http.c | 40 +-
dirmngr/http.h | 9 +-
dirmngr/ks-engine-hkp.c | 2 +-
dirmngr/ks-engine-http.c | 14 +-
dirmngr/server.c | 151 +-
dirmngr/t-http.c | 2 +-
doc/DETAILS | 44 +
doc/HACKING | 32 +-
doc/Makefile.am | 42 +-
doc/Makefile.in | 1208 ---
doc/TRANSLATE | 2 +-
doc/debugging.texi | 27 +-
doc/defsincdate | 2 +-
doc/gnupg-card-architecture.eps | 1003 --
doc/gnupg-card-architecture.pdf | Bin 19753 -> 19753 bytes
doc/gnupg-module-overview.pdf | Bin 0 -> 315248 bytes
doc/gnupg-module-overview.png | Bin 0 -> 36868 bytes
doc/gnupg-module-overview.svg | 892 ++
doc/gnupg.info | 368 +-
doc/gnupg.info-1 | 165 +-
doc/gnupg.info-2 | 353 +-
doc/gpg-agent.texi | 44 +-
doc/gpg.texi | 94 +-
doc/gpgsm.texi | 32 +-
doc/gpgv.texi | 24 +-
doc/help.ru.txt | 333 +-
doc/help.txt | 6 +-
doc/mkdefsinc.c | 27 +-
g10/Makefile.am | 106 +-
g10/Makefile.in | 1182 ---
g10/armor.c | 88 +-
g10/build-packet.c | 446 +-
g10/call-agent.c | 5 +-
g10/call-dirmngr.c | 66 +-
g10/call-dirmngr.h | 2 +
g10/card-util.c | 12 +-
g10/cipher.c | 5 +-
g10/compress.c | 1 -
g10/dearmor.c | 1 -
g10/decrypt-data.c | 15 +-
g10/decrypt.c | 1 -
g10/dek.h | 6 +
g10/delkey.c | 1 -
g10/ecdh.c | 11 +-
g10/encrypt.c | 168 +-
g10/export.c | 5 +-
g10/free-packet.c | 3 +-
g10/getkey.c | 75 +-
g10/gpg.c | 13 +-
g10/gpgcompose.c | 3038 ++++++
g10/gpgv.c | 11 +
g10/import.c | 23 +-
g10/kbnode.c | 1 -
g10/keydb.c | 11 +-
g10/keydb.h | 40 +-
g10/keyedit.c | 944 +-
g10/keygen.c | 156 +-
g10/keyid.c | 67 +-
g10/keylist.c | 47 +-
g10/keyring.c | 17 +-
g10/keyserver-internal.h | 2 +
g10/keyserver.c | 36 +-
g10/main.h | 19 +-
g10/mainproc.c | 9 +-
g10/mdfilter.c | 1 -
g10/migrate.c | 2 +-
g10/misc.c | 2 -
g10/openfile.c | 1 -
g10/options.h | 2 +
g10/packet.h | 260 +-
g10/parse-packet.c | 13 +-
g10/passphrase.c | 3 +-
g10/pkclist.c | 27 +-
g10/pkglue.c | 5 +-
g10/plaintext.c | 3 +-
g10/progress.c | 7 +-
g10/pubkey-enc.c | 5 +-
g10/revoke.c | 1 -
g10/server.c | 35 +-
g10/seskey.c | 45 +-
g10/sig-check.c | 408 +-
g10/sign.c | 11 +-
g10/skclist.c | 1 -
g10/sqlite.c | 5 +-
g10/t-stutter-data.asc | 1 +
g10/t-stutter.c | 610 ++
g10/tdbdump.c | 1 -
g10/tdbio.c | 129 +-
g10/test-stubs.c | 11 +
g10/test.c | 8 +-
g10/textfilter.c | 3 +-
g10/tofu.c | 656 +-
g10/trust.c | 11 +-
g10/trustdb.c | 50 +-
g10/trustdb.h | 13 +-
g10/verify.c | 1 -
g13/Makefile.am | 38 +-
g13/Makefile.in | 773 --
g13/backend.c | 155 +-
g13/backend.h | 11 +-
g13/be-dmcrypt.c | 99 +
g13/be-dmcrypt.h | 35 +
g13/call-syshelp.c | 488 +
g13/call-syshelp.h | 36 +
g13/create.c | 100 +-
g13/create.h | 6 +-
g13/g13-syshelp.c | 753 ++
g13/g13-syshelp.h | 95 +
g13/g13.c | 103 +-
g13/g13.h | 10 +-
g13/{utils.c => g13tuple.c} | 171 +-
g13/{utils.h => g13tuple.h} | 17 +-
g13/keyblob.c | 229 +
g13/keyblob.h | 48 +-
g13/mount.c | 275 +-
g13/mount.h | 2 -
g13/mountinfo.c | 2 +-
g13/server.c | 98 +-
g13/sh-blockdev.c | 152 +
g13/sh-cmd.c | 780 ++
g13/sh-dmcrypt.c | 943 ++
g13/suspend.c | 143 +
g13/{create.h => suspend.h} | 15 +-
g13/t-g13tuple.c | 223 +
kbx/Makefile.in | 1205 ---
kbx/keybox-file.c | 2 +-
m4/Makefile.in | 498 -
m4/intdiv0.m4 | 70 -
m4/intl.m4 | 259 -
m4/lock.m4 | 311 -
m4/printf-posix.m4 | 44 -
m4/size_max.m4 | 62 -
m4/uintmax_t.m4 | 30 -
m4/wint_t.m4 | 20 -
po/Makefile.in.in | 429 -
po/ca.gmo | Bin 46607 -> 0 bytes
po/ca.po | 2789 ++---
po/cs.gmo | Bin 219029 -> 0 bytes
po/cs.po | 2812 ++---
po/da.gmo | Bin 144609 -> 0 bytes
po/da.po | 2798 ++---
po/de.gmo | Bin 236965 -> 0 bytes
po/de.po | 2872 ++---
po/el.gmo | Bin 46733 -> 0 bytes
po/el.po | 2789 ++---
po/en at boldquot.gmo | Bin 215384 -> 0 bytes
po/en at boldquot.po | 2818 ++---
po/en at quot.gmo | Bin 212992 -> 0 bytes
po/en at quot.po | 2816 ++---
po/eo.gmo | Bin 30286 -> 0 bytes
po/eo.po | 2786 ++---
po/es.gmo | Bin 144176 -> 0 bytes
po/es.po | 2801 ++---
po/et.gmo | Bin 44031 -> 0 bytes
po/et.po | 2789 ++---
po/fi.gmo | Bin 46182 -> 0 bytes
po/fi.po | 2794 ++---
po/fr.gmo | Bin 222985 -> 0 bytes
po/fr.po | 2798 ++---
po/gl.gmo | Bin 45753 -> 0 bytes
po/gl.po | 2789 ++---
po/gnupg2.pot | 2728 ++---
po/hu.gmo | Bin 45696 -> 0 bytes
po/hu.po | 2789 ++---
po/id.gmo | Bin 44358 -> 0 bytes
po/id.po | 2789 ++---
po/it.gmo | Bin 45785 -> 0 bytes
po/it.po | 2789 ++---
po/ja.gmo | Bin 230767 -> 0 bytes
po/ja.po | 2788 ++---
po/nb.gmo | Bin 63253 -> 0 bytes
po/nb.po | 2784 ++---
po/pl.gmo | Bin 147621 -> 0 bytes
po/pl.po | 2812 ++---
po/pt.gmo | Bin 38752 -> 0 bytes
po/pt.po | 2789 ++---
po/ro.gmo | Bin 86833 -> 0 bytes
po/ro.po | 2796 ++---
po/ru.gmo | Bin 274140 -> 0 bytes
po/ru.po | 3315 +++---
po/sk.gmo | Bin 45261 -> 0 bytes
po/sk.po | 2793 ++---
po/stamp-po | 1 -
po/sv.gmo | Bin 144810 -> 0 bytes
po/sv.po | 2799 ++---
po/tr.gmo | Bin 142504 -> 0 bytes
po/tr.po | 2798 ++---
po/uk.gmo | Bin 284070 -> 0 bytes
po/uk.po | 2816 ++---
po/zh_CN.gmo | Bin 88609 -> 0 bytes
po/zh_CN.po | 2784 ++---
po/zh_TW.gmo | Bin 194247 -> 0 bytes
po/zh_TW.po | 2788 ++---
scd/Makefile.am | 2 +-
scd/Makefile.in | 780 --
scd/ccid-driver.c | 355 +-
scd/command.c | 52 +-
sm/Makefile.am | 3 +-
sm/Makefile.in | 812 --
sm/call-agent.c | 85 +-
sm/gpgsm.c | 25 +-
sm/gpgsm.h | 3 +-
sm/keydb.c | 12 +
sm/passphrase.c | 90 +
g13/create.h => sm/passphrase.h | 16 +-
sm/server.c | 33 +-
tests/Makefile.in | 902 --
tests/openpgp/Makefile.am | 15 +-
tests/openpgp/Makefile.in | 714 --
tests/openpgp/default-key.test | 8 +-
tests/openpgp/defs.inc | 4 +-
tests/openpgp/fake-pinentry.c | 67 +
tests/openpgp/gpg-agent.conf.tmpl | 1 -
tests/openpgp/gpgtar.test | 14 +-
tests/openpgp/mds.test | 2 +-
tests/openpgp/mkdemodirs | 2 +-
tests/openpgp/plain-largeo.asc | 4205 ++++++++
tests/openpgp/signdemokey | 2 +-
tests/openpgp/use-exact-key.test | 4 +-
tests/openpgp/version.test | 8 +-
tests/pkits/Makefile.in | 673 --
tools/Makefile.in | 1160 --
tools/gpg-zip.in | 8 +-
tools/gpgconf-comp.c | 4 +-
tools/gpgparsemail.c | 41 +-
tools/gpgtar.c | 1 -
tools/mk-tdata.c | 6 +
300 files changed, 64612 insertions(+), 93012 deletions(-)
diff --cc ChangeLog
index d6786b3,8bd68a6..d608af8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9949 -1,16 +1,11057 @@@
-No more ChangeLog files
-========================
++2016-05-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.12.
+
++ speedo,w32: Remove the installation directory page.
++ * build-aux/speedo/w32/inst.nsi (MUI_PAGE_DIRECTORY): Remove.
+
++ gpg: Fix const char pointer mismatch with gettext.
++ * g10/tofu.c (get_trust): Use const char *.
+
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
++ speedo: Build sqlite with static-libgcc.
++ * build-aux/speedo/patches/sqlite.patch: New.
++ * Makefile.am (EXTRA_DIST): Add file.
++
++ speedo: Also try patch files w/o version number.
++ * build-aux/speedo.mk (SPKG_template): Try such a patch file.
++
++2016-05-04 Andre Heinecke <aheinecke at intevation.de>
++
++ speedo,w32: Install sqlite.
++ * build-aux/speedo/w32/inst.nsi (-sqlite, -un.sqlite): New.
++
++ speedo,w32: Fix uninstallation.
++ * build-aux/speedo/w32/inst.nsi (-un.gnupg): Delete distsigkey and
++ dirmngr-conf.skel
++
++ speedo,w32: Install localisation.
++ * build-aux/speedo/w32/inst.nsi (-libgpg-error, GnuPG): Install l10n.
++ (-un.libgpg-error, -un.gnupg): Uninstall l10n files.
++
++2016-05-04 Werner Koch <wk at gnupg.org>
++
++ tests: Disable the migrations tests.
++ * tests/Makefile.am (SUBDIRS): Remove migrations.
++ * configure.ac (AC_CONFIG_FILES): Remove migrations Makefile.
++
++2016-05-04 Ineiev <ineiev at gnu.org>
++
++ po: Update Russian translation.
++
++2016-05-04 Werner Koch <wk at gnupg.org>
++
++ po: Update German translation.
++
++ Some minor string changes and fixed a printf format.
++ * g10/build-packet.c (notation_value_to_human_readable_string): Use
++ %zu for size_t.
++
++ build: Update config.{guess,sub} to 2016-04-02 and 2016-03-30.
++ * build-aux/config.guess: Update.
++ * build-aux/config.sub: Update.
++
++ agent: Make --allow-loopback-pinentry the default.
++ * agent/gpg-agent.c (oNoAllowLoopbackPinentry): New.
++ (opts): Add --no-allow-loopback-pinentry. Hide
++ description of --allow-loopback-pinentry.
++ (parse_rereadable_options): Set opt.allow_loopback_pinentry by
++ default.
++ (main): Replace allow-loopback-pinentry by no-allow-loopback-pinentry
++ in the gpgconf list.
++ * tools/gpgconf-comp.c (gc_options_gpg_agent): Ditto.
++
++2016-05-03 Werner Koch <wk at gnupg.org>
++
++ common: Print https URLs in help messages.
++ * common/argparse.c (strusage): Print https URLS.
++
++ tests: Silence output of some tests.
++ * common/t-exechelp.c (print_open_fds): Silence non-verbose output.
++ (test_close_all_fds): Ditto.
++ * common/t-session-env.c (show_stdnames): Indent output.
++ * g10/test.c (TEST): Silence non-verbose okay output.
++ (exit_tests): Ditto.
++ * tools/gpg-zip.in (tar_verbose_opt): Add option --quiet.
++ * tests/openpgp/gpgtar.test (GPGZIP): Pass option --quiet.
++ * tests/openpgp/mds.test: Indent MD5 notice.
++ * tests/openpgp/version.test: Indent --version output.
++
++ gpg: Emit status lines TOFU_STATS and TOFU_STATS_LONG.
++ * g10/tofu.c (NO_WARNING_THRESHOLD): Rename to BASIC_TRUST_THRESHOLD.
++ (FULL_TRUST_THRESHOLD): New.
++ (write_stats_status): New.
++ (show_statistics): Call new function. Print TOFU_STATS_LONG.
++
++2016-05-02 Werner Koch <wk at gnupg.org>
++
++ gpg: Extend TRUST_foo status lines with the trust model.
++ * g10/trustdb.h (TRUST_FLAG_TOFU_BASED): New.
++ * g10/trustdb.c (trust_model_string): Lowercase the strings. Add arg
++ "model" and change callers to call with OPT.TRUST_MODEL.
++ * g10/tofu.c (tofu_wot_trust_combine): Set TRUST_FLAG_TOFU_BASED.
++ * g10/pkclist.c (write_trust_status): New.
++ (check_signatures_trust): Call new function.
++
++ gpg: Improve line wrapping for a tofu message.
++ * g10/tofu.c (time_ago_str): Mark non-breakable spaces.
++ (show_statistics): Remove marks.
++
++ gpg: Re-format some tofu messages.
++ * common/status.h (STATUS_TOFU_USER, STATUS_TOFU_STATS)
++ (STATUS_TOFU_STATS_SHORT, STATUS_TOFU_STATS_LONG): New.
++ * g10/tofu.c (NO_WARNING_THRESHOLD): New.
++ (record_binding, tofu_register): Take care of --dry-run.
++ (show_statistics): Print STATUS_TOFU_USER. Reformat some messages.
++ Fix the ngettext/strcmp thing. Use log_string instead of log_info.
++ Use NO_WARNING_THRESHOLD constant.
++ (get_trust): Use format_text and print a compact fingerprint.
++
++2016-05-02 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: More fix of error return path.
++ * scd/command.c (open_card): Return GPG_ERR_ENODEV on the failure of
++ apdu_connect.
++
++2016-04-29 Werner Koch <wk at gnupg.org>
++
++ common: Extend log_string to indent lines.
++ * common/logging.c (do_logv): Add indentation when called via
++ log_string.
++
++ gpg: Factor some code code out of tofu.c.
++ * g10/tofu.c (string_to_long): New.
++ (string_to_ulong): New.
++ (get_single_unsigned_long_cb): Replace strtol/strtoul by new function.
++ (get_single_long_cb): Ditto.
++ (signature_stats_collect_cb): Ditto.
++ (get_policy): Ditto.
++ (show_statistics): Ditto. Uese es_free instead of free.
++
++ gpg: Remove all assert.h and s/assert/log_assert/.
++
++ common: Improve log_assert.
++ * common/logging.c (bug_at): Do not i18n the string.
++ (_log_assert): New.
++ * common/logging.h (log_assert): Use new function and pass line
++ information.
++
++2016-04-28 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Fix error return path.
++ * scd/ccid-driver.c (bulk_in): Remove EAGAIN handling.
++ Handle LIBUSB_ERROR_NO_DEVICE to return CCID_DRIVER_ERR_NO_READER.
++
++2016-04-27 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Fix memory leaks.
++ * scd/ccid-driver.c (scan_or_find_usb_device): Return on
++ LIBUSB_ERROR_NO_MEM. Free CONFIG before return except on error.
++ (scan_or_find_devices): Free device list.
++
++2016-04-27 Werner Koch <wk at gnupg.org>
++
++ gpg: Add experimental AKL method "wkd" and option --with-wkd-hash.
++ * g10/getkey.c (parse_auto_key_locate): Add method "wkd".
++ (get_pubkey_byname): Implement that method. Also rename a variable.
++ * g10/call-dirmngr.c (gpg_dirmngr_wkd_get): New.
++ * g10/keyserver.c (keyserver_import_wkd): New.
++ * g10/test-stubs.c (keyserver_import_wkd): Add stub.
++ * g10/gpgv.c (keyserver_import_wkd): Ditto.
++ * g10/options.h (opt): Add field 'with_wkd_hash'.
++ (AKL_WKD): New.
++
++ * g10/gpg.c (oWithWKDHash): New.
++ (opts): Add option --with-wkd-hash.
++ (main): Set that option.
++ * g10/keylist.c (list_keyblock_print): Implement that option.
++
++ dirmngr: Add experimental command WKD_GET.
++ * dirmngr/server.c (cmd_wkd_get): New.
++ (register_commands): Add command WKD_GET.
++
++ dirmngr: Use system provided root CAs with KS_FETCH.
++ * dirmngr/ks-engine-http.c (ks_http_fetch): Use HTTP_FLAG_TRUST_SYS.
++
++2016-04-26 Werner Koch <wk at gnupg.org>
++
++ http: Allow to request system defined CAs for TLS.
++ * dirmngr/http.h (HTTP_FLAG_TRUST_DEF, HTTP_FLAG_TRUST_SYS): New.
++ * dirmngr/http.c (http_session_new): Add arg "flags".
++ * dirmngr/ks-engine-hkp.c (send_request): Use new flag
++ HTTP_FLAG_TRUST_DEF for the new arg of http_session_new.
++ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
++ * dirmngr/t-http.c (main): Ditto.
++
++2016-04-25 Werner Koch <wk at gnupg.org>
++
++ common: Minor fixes for the new private-keys.c.
++ * common/private-keys.c (my_error_from_syserror): New. Use it in
++ place of gpg_error_from_syserror.
++ (_pkc_add, pkc_lookup, pke_next_value): Use ascii_strcasecmp.
++ (pkc_parse): Use xtrystrdup and append_to_strlist_try as intended.
++
++ (_pkc_add): Add braces around if-statement.
++
++ common: Use new function to print a failure of xtrymalloc.
++ * common/miscellaneous.c (xoutofcore): New.
++ * common/strlist.c (append_to_strlist): Use instead of abort.
++ (append_to_strlist_try): Use xtrymalloc instead of xmalloc.
++
++2016-04-21 Justus Winter <justus at g10code.com>
++
++ common: Add support for the new extended private key format.
++ * agent/findkey.c (write_extended_private_key): New function.
++ (agent_write_private_key): Detect if an existing file is in extended
++ format and update the key within if it is.
++ (read_key_file): Handle the new format.
++ * agent/keyformat.txt: Document the new format.
++ * common/Makefile.am: Add the new files.
++ * common/private-keys.c: New file.
++ * common/private-keys.h: Likewise.
++ * common/t-private-keys.c: Likewise.
++ * common/util.h (alphap, alnump): New macros.
++ * tests/migrations: Add test demonstrating that we can cope with the
++ new format.
++
++ common: Add 'free_strlist_wipe' which wipes memory.
++ * common/strlist.c (free_strlist_wipe): New function.
++ * common/strlist.h (free_strlist_wipe): New prototype.
++
++ common: Add 'append_to_strlist_try' which can fail.
++ * common/strlist.c (append_to_strlist): Use the new function.
++ (append_to_strlist_try): New function.
++ * common/strlist.h (append_to_strlist_try): New prototype.
++
++ agent: Convert key format document to org.
++ * agent/keyformat.txt: Convert to org mode.
++
++ tests: Make migration test more robust and silent.
++ * tests/migrations/from-classic.test: Fix in-tree build, silence test.
++
++ Fixes-commit: defbc70b
++
++2016-04-21 Werner Koch <wk at gnupg.org>
++
++ w32: Use --enable-gpg2-is-gpg by default.
++ * autogen.rc: Add option also for plain Windows.
++
++ w32: Replace libiconv DLL by iconv feature of libgpg-error.
++ * configure.ac: Do nor require libiconv for W32.
++ * common/utf8conv.c [W32]: Do not incluce iconv.h. Request
++ libgpg-error iconv macros.
++ (jnlib_iconv): Use ICONV_CONST macro.
++ * build-aux/speedo/w32/inst.nsi [!WITH_GUI]: Do not install libiconv.
++ * build-aux/speedo.mk (speedo_spkgs) [!WITH_GUI]: Likewise.
++
++2016-04-20 Justus Winter <justus at g10code.com>
++
++ agent: Sanitize permissions of the private key directory.
++ * agent/gpg-agent.c (create_private_keys_directory): Set permissions.
++ * common/sysutils.c (modestr_to_mode): New function.
++ (gnupg_mkdir): Use new function.
++ (gnupg_chmod): New function.
++ * common/sysutils.h (gnupg_chmod): New prototype.
++ * tests/migrations/from-classic.test: Test migration with existing
++ directory.
++
++ GnuPG-bug-id: 2312
++
++ tests: Test the migration from a classic GnuPG home directory.
++ * configure.ac: Add new directory.
++ * tests/Makefile.am (SUBDIRS): Likewise.
++ * tests/migrations/Makefile.am: New file.
++ * tests/migrations/from-classic.gpghome/pubring.gpg.asc: Likewise.
++ * tests/migrations/from-classic.gpghome/secring.gpg.asc: Likewise.
++ * tests/migrations/from-classic.gpghome/trustdb.gpg.asc: Likewise.
++ * tests/migrations/from-classic.test: Likewise.
++
++2016-04-20 Werner Koch <wk at gnupg.org>
++
++ speedo: Use swdb.lst to define the SQLite version.
++ * build-aux/speedo.mk: Change sqlite to use our mirror and the
++ swdb.lst file.
++ * build-aux/speedo/w32/inst.nsi: gpg is now build and installed as
++ gpg.
++
++2016-04-19 Werner Koch <wk at gnupg.org>
++
++ gpg: Improve UID selction of --quick-sign-key.
++ * g10/keyedit.c (keyedit_quick_sign): Improve UID selection and print
++ error for non-found userids.
++
++ gpg: Avoid debug like output at start of --edit-key.
++ * g10/keyedit.c (check_all_keysigs): Print info only after something
++ has been modified.
++
++2016-04-15 Andre Heinecke <aheinecke at intevation.de>
++
++ dirmngr: Fix https never reported in general help.
++ * dirmngr/ks-engine-http.c (ks_hkp_help): Also print https
++ when supported and no uri provided.
++
++ dirmngr: Fix https incorrectly reported in help.
++ * dirmngr/ks-engine-http.c (ks_hkp_help): Only print https if tls
++ is supported.
++
++2016-04-14 Werner Koch <wk at gnupg.org>
++
++ agent: Fix regression due to recent commit 4159567.
++ * agent/protect.c (do_encryption): Fix CBC hashing.
++
++ agent: Allow gpg-protect-tool to handle openpgp-native protection.
++ * agent/protect-tool.c (read_and_unprotect): Add arg ctrl and pass to
++ agent_unprotect.
++ (main): Allocate a simple CTRL object and pass it to
++ read_and_unprotect.
++ (convert_from_openpgp_native): Remove stub.
++ (agent_key_available, agent_get_cache): New stubs.
++ (agent_askpin): New emulation for the one in call-pinentry.c.
++ (agent_write_private_key): New to dump key.
++ * agent/Makefile.am (gpg_protect_tool_SOURCES): Add cvt-openpgp.c
++
++ tests: Set fake-pinentry's stdout and stdin to _IOLBF.
++ * tests/openpgp/fake-pinentry.c (main): Call setvbuf. Show passphrase
++ at startup. Increase buffer.
++
++2016-04-12 Werner Koch <wk at gnupg.org>
++
++ agent: Implement new protection mode openpgp-s2k3-ocb-aes.
++ * agent/protect.c (agent_protect): Add arg use_ocb. Change all caller
++ to pass -1 for default.
++ * agent/protect-tool.c: New option --debug-use-ocb.
++ (oDebugUseOCB): New.
++ (opt_debug_use_ocb): New.
++ (main): Set option.
++ (read_and_protect): Implement option.
++
++ * agent/protect.c (OCB_MODE_SUPPORTED): New macro.
++ (PROT_DEFAULT_TO_OCB): New macro.
++ (do_encryption): Add args use_ocb, hashbegin, hashlen, timestamp_exp,
++ and timestamp_exp_len. Implement OCB.
++ (agent_protect): Change to support OCB.
++ (do_decryption): Add new args is_ocb, aadhole_begin, and aadhole_len.
++ Implement OCB.
++ (merge_lists): Allow NULL for sha1hash.
++ (agent_unprotect): Change to support OCB.
++ (agent_private_key_type): Remove debug output.
++
++ indent: Help Emacs not to get confused by conditional compilation.
++ * agent/protect.c (calibrate_get_time) [W32]: Use separate function
++ calls for W32 and W32CE.
++
++2016-04-07 Justus Winter <justus at g10code.com>
++
++ g10: Fix exporting secret keys of certain sizes.
++ * g10/build-packet.c (do_key): Do not use the header length specified
++ by the public key packet from the keyring, but let 'write_header2'
++ compute the required length.
++
++2016-04-06 Justus Winter <justus at g10code.com>
++
++ Revert "g10: Support armored keyrings in gpgv."
++ This reverts commit abb352de51bc964c06007fce43ed6f6caea87c15.
++
++2016-04-05 Justus Winter <justus at g10code.com>
++
++ dirmngr: Autodetect PEM format in dirmngr-client.
++ * dirmngr/dirmngr-client.c (init_asctobin): New function.
++ (main): Move the initialization code to the new function.
++ (read_pem_certificate): Initialize base64 table.
++ (read_certificate): Try to decode certificates given in files as PEM
++ first.
++
++ GnuPG-bug-id: 1844
++
++2016-04-05 Werner Koch <wk at gnupg.org>
++
++ build: Fix for: Build gpgcompose only in maintainer mode.
++ * g10/Makefile.am (noinst_PROGRAMS): Always add module_tests.
++
++ doc: Install gpg and gpgv man pages under the correct name.
++ * doc/mkdefsinc.c (main): Add double include guard. Set variable
++ gpgtwohack. Define macros gpgname and gpgvname.
++ * doc/gpg.texi: Remove macro definition for gpgname. Use Texinfo var
++ gpgtwohack to prepare the man pages. Use @gpgname everywhere.
++ * doc/gpgv.texi: Likewise.
++ * doc/Makefile.am (myman_pages): Remove gpg2.1 and gpgv2.1 but add
++ them depending on USE_GPG2_HACK.
++
++ build: Build gpgcompose only in maintainer mode.
++ * g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose only in maintainer
++ mode.
++
++ gpg: Replace use of "gpg2" by GPG_NAME.
++
++2016-04-04 Werner Koch <wk at gnupg.org>
++
++ Now build "gpg" binary but install as "gpg2"
++ * configure.ac (USE_GPG2_HACK): New ac_define am_conditional.
++ * common/homedir.c (gnupg_module_name): Replace use of macro
++ NAME_OF_INSTALLED_GPG.
++ * g10/keygen.c (generate_keypair): Ditto.
++ * g10/Makefile.am (bin_PROGRAMS): Remove.
++ (noinst_PROGRAMS): Add gpg or gpg2 and gpgv or gpg2.
++ (gpg2_hack_list): New.
++ (use_gpg2_hack): New.
++ (gpg2_SOURCES): Rename to gpg_SOURCES.
++ (gpgv2_SOURCES): Rename to gpgv_SOURCES.
++ (gpg2_LDADD): Rename to gpg_LDADD.
++ (gpgv2_LDADD): Rename to gpgv_LDADD.
++ (gpg2_LDFLAGS): Rename to gpg_LDFLAGS.
++ (gpgv2_LDFLAGS): Rename to gpgv2_LDFLAGS.
++ (install-exec-hook): Remove WinCE specific rules and add new rules.
++ (uninstall-local): Uninstall gpg/gpg2 and gpgv/gpgv2.
++ * tests/openpgp/Makefile.am (required_pgms): s/gpg2/gpg/.
++ * tests/openpgp/defs.inc: Ditto.
++ * tests/openpgp/gpgtar.test: Ditto.
++ * tests/openpgp/mkdemodirs: Ditto.
++ * tests/openpgp/signdemokey: Ditto.
++
++ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove obsolete
++ --enable-mailto, add --enable-gpg2-is-gpg.
++
++ tests: Add missing file.
++ * tests/openpgp/Makefile.am (TEST_FILES): Add plain-largeo.asc.
++
++2016-04-04 Justus Winter <justus at g10code.com>
++
++ g10: Support armored keyrings in gpgv.
++ * doc/gpgv.texi: Document the feature.
++ * g10/Makefile.am (gpgv2_SOURCES): Add dearmor.c.
++ * g10/dearmor.c (dearmor_file): Add sink argument.
++ * g10/gpg.c (main): Adapt accordingly.
++ * g10/gpgv.c (make_temp_dir): New function.
++ (main): De-armor keyrings.
++ * g10/main.h (dearmor_file): Adapt prototype.
++
++ GnuPG-bug-id: 2290
++
++ tests: Fix default key test.
++ * tests/openpgp/default-key.test: Avoid using the option
++ '--trust-model' unconditionally.
++
++2016-04-01 Justus Winter <justus at g10code.com>
++
++ build: Check for conflicting trust model options.
++ * configure.ac: Disable TOFU if configured without trust models, and
++ check for conflicting options.
++
++ g10: Remove option --always-trust if compiled without trust models.
++ * g10/gpg.c (opts): Remove option --always-trust if compiled without
++ trust models.
++
++2016-03-31 Justus Winter <justus at g10code.com>
++
++ speedo,w32: Build libsqlite3.
++ * build-aux/speedo.mk (speedo_spkgs): Add libsqlite3 on w32.
++ (libsqlite3_ver): New variable.
++ (speedo_pkg_libsqlite3_tar): Likewise.
++
++ g10: Use gpg-error abstraction of sched_yield.
++ * g10/tofu.c (begin_transaction): Use 'gpgrt_yield'.
++
++2016-03-29 Werner Koch <wk at gnupg.org>
++
++ gpg: Fix NULL-segv for missing tofu DB.
++ * g10/tofu.c (opendb): Guard call to timeout function.
++
++2016-03-22 Werner Koch <wk at gnupg.org>
++
++ gpg: Improve message when asking for key capabilities.
++ * g10/keygen.c (ask_key_flags): Improve message.
++
++ gpg: Remove the extra prompt for Curve25519.
++ * g10/keygen.c (MY_USE_ECDSADH): New macro local to ask_curve.
++ (ask_curve): Use a fixed table of curve names and reserve a slot for
++ Curve448. Simplify CurveNNNN/EdNNNN switching.
++ (ask_curve): Remove the Curve25519 is non-standard prompt.
++
++2016-03-19 Werner Koch <wk at gnupg.org>
++
++ gpg: Silence trustdb computation with --quiet.
++ * g10/trustdb.c (validate_keys): Do not print log_info stuff in quiet
++ mode.
++
++2016-03-17 Werner Koch <wk at gnupg.org>
++
++ sm: Always create a keybox header when creating a new keybox.
++ * sm/keydb.c (maybe_create_keybox): Create the header blob.
++
++2016-03-17 Neal H. Walfield <neal at g10code.com>
++
++ doc: Improve documentation of --enable-large-rsa.
++ * doc/gpg.texi (--enable-large-rsa): Improve text.
++
++2016-03-17 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: allow removal of the shadowed key.
++ * agent/findkey.c (agent_delete_key): Remove the key when asked.
++
++2016-03-16 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10: Add const qualifier.
++ * g10/gpgcompose.c (show_help): Those are strings not to be modified.
++
++2016-03-15 Werner Koch <wk at gnupg.org>
++
++ gpg: Do not rely on a certain evaluation order.
++ * g10/keyedit.c (print_and_check_one_sig): Call check_key_signature
++ before derefing IS_SELFSIG.
++
++2016-03-14 Werner Koch <wk at gnupg.org>
++
++ scd: Add manufacturer id 0x000a.
++ * g10/card-util.c (get_manufacturer): Add it.
++
++2016-03-10 Kevin J. McCarthy <kevin at 8t8.us>
++
++ g10: Silence message if --quiet is given.
++ * g10/getkey.c (parse_def_secret_key): Silence message if --quiet is
++ given.
++
++2016-03-08 Neal H. Walfield <neal at g10code.com>
++
++ gpg: Add a new test.
++ * g10/Makefile.am (EXTRA_DIST): Add t-stutter-data.asc.
++ (module_tests): Add t-stutter.
++ (t_stutter_SOURCES): New variable.
++ (t_stutter_LDADD): New variable.
++
++2016-03-07 Justus Winter <justus at g10code.com>
++
++ sm: Implement pinentry loopback and reading passphrases from fd.
++ * doc/gpgsm.texi: Document '--pinentry-mode' and '--passphrase-fd'.
++ * sm/Makefile.am (gpgsm_SOURCES): Add new files
++ * sm/call-agent.c (struct default_inq_parm_s): New definition.
++ (start_agent): Pass in the pinentry mode.
++ (default_inq_cb): Handle 'PASSPHRASE' and 'NEW_PASSPHRASE' inquiries.
++ Adapt all call sites to the new callback cookie.
++ * sm/gpgsm.c (cmd_and_opt_values): Add new values.
++ (opts): Add new options.
++ (main): Handle new options.
++ * sm/gpgsm.h (struct opt): Add field 'pinentry_mode'.
++ * sm/passphrase.c: New file.
++ * sm/passphrase.h: Likewise.
++
++ GnuPG-bug-id: 1970
++
++ sm: Remove unused argument '--fixed-passphrase'.
++ * doc/gpgsm.texi: Drop description.
++ * sm/gpgsm.c (cmd_and_opt_values): Drop enum value.
++ (opts): Drop argument.
++ (main): Drop argument handling.
++ * sm/gpgsm.h (struct opt): Drop field 'fixed_passphrase'.
++
++ kbx: Avoid undefined behavior.
++ * kbx/keybox-file.c (_keybox_read_blob2): Cast to unsigned int before
++ shifting.
++
++2016-03-07 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Bug fix for a device with multiple interfaces.
++ * scd/ccid-driver.c (scan_or_find_usb_device): Use IFC_NO when
++ accessing interface information.
++
++2016-03-04 Justus Winter <justus at g10code.com>
++
++ build: Make libusb a hard requirement if the ccid driver is requested.
++ * configure.ac: Print an error message and die if the internal ccid
++ driver is requested but no suitable libusb is found.
++
++ g10: Drop superfluous declaration.
++ * g10/main.h (disable_core_dumps): Drop declaration.
++
++ g10: Guard code against errors.
++ * g10/keygen.c (do_generate_keypair): Check for errors, in which case
++ 'pri_psk' is NULL.
++
++ Fixes-commit: bf9d1248
++
++2016-03-03 Justus Winter <justus at g10code.com>
++
++ dirmngr: Add more missing CFLAGS.
++ * dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
++ 'GCRYPT_CFLAGS'.
++ (t_dns_stuff_CFLAGS): Likewise.
++
++ GnuPG-bug-id: 2235
++
++ tests/openpgp: Skip gpgtar test if it has not been built.
++ * tests/openpgp/gpgtar.test: Check if executable exists.
++
++ GnuPG-bug-id: 2261
++
++2016-03-02 Neal H. Walfield <neal at g10code.com>
++
++ gpg: Add new program gpgcompose.
++ * g10/packet.h: Include "util.h".
++ * g10/encrypt.c (encrypt_seskey): Don't mark as static.
++ * g10/gpgcompose.c: New file.
++ * g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose.
++ (gpg2_SOURCES): Split everything but gpg.c into...
++ (gpg_sources): ... this new variable.
++ (gpgcompose_SOURCES): New variable.
++ (gpgcompose_LDADD): Likewise.
++ (gpgcompose_LDFLAGS): Likewise.
++
++ gpg: More robustly detect valid non-armored OpenPGP messages.
++ * g10/armor.c (is_armored): More robustly detect valid non-armored
++ OpenPGP messages.
++
++ common: Provide a function for mapping packet types to strings.
++ * common/openpgpdefs.h (pkttype_str): New function.
++
++ gpg: Rename pop_filter to iobuf_pop_filter and export it.
++ * common/iobuf.c (pop_filter): Rename from this...
++ (iobuf_pop_filter): ... to this. Don't mark it as static.
++
++ gpg: Split write_pubkey_enc_from_list.
++ * g10/encrypt.c (write_pubkey_enc_from_list): Split the body of this
++ function out into...
++ (write_pubkey_enc): ... this new function.
++
++ gpg: Allow the caller to write the contents of a plaintext packet.
++ * g10/build-packet.c (do_plaintext): Change the semantics such that if
++ PT->BUF is NULL, it is the caller's responsibility to write the
++ content (and disable partial body length mode, if appropriate).
++
++ gpg: Add a new function for creating binary notations.
++ * g10/build-packet.c (blob_to_notation): New function.
++
++ gpg: Refactor the printing of binary notations.
++ * g10/build-packet.c (sig_to_notation): Break printing of binary
++ notations into...
++ (notation_value_to_human_readable_string): ... this new function.
++ Provide a small preview of the binary data substituting non-printable
++ characters with '?'.
++
++2016-03-02 Uldis Anšmits <uldis.ansmits at tieto.com>
++
++ tests/openpgp: Make tests more portable.
++ * tests/openpgp/default-key.test: Avoid 'grep -q'.
++ * tests/openpgp/gpgtar.test: Avoid 'grep -qe' and 'diff -q'.
++ * tests/openpgp/use-exact-key.test: Avoid 'grep -q'.
++
++ GnuPG-bug-id: 2262
++
++2016-03-02 Justus Winter <justus at g10code.com>
++
++ common: Consolidate Assuan server argument handling.
++ * common/Makefile.am (common_sources): Add new files.
++ * common/server-help.c: New file.
++ * common/server-help.h: Likewise.
++ * agent/command.c: Drop argument handling primitives in favor of using
++ the consolidated ones.
++ * dirmngr/server.c: Likewise.
++ * g10/server.c: Likewise.
++ * g13/server.c: Likewise.
++ * scd/command.c: Likewise.
++ * sm/server.c: Likewise.
++
++2016-03-01 Justus Winter <justus at g10code.com>
++
++ dirmngr: Add missing CFLAGS.
++ * dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
++ 'GPG_ERROR_CFLAGS'.
++ (t_dns_stuff_CFLAGS): Likewise.
++
++ tools: Drop superfluous include.
++ * tools/gpgtar.c: Do not include unused 'npth.h'.
++
++2016-02-26 Werner Koch <wk at gnupg.org>
++
++ gpg: Prettify a 2 octet hex output.
++ * g10/sig-check.c (check_key_signature2): Wrap line and use %02x.
++
++2016-02-25 Neal H. Walfield <neal at g10code.com>
++
++ gpg: Show debugging info if a sig with an unsupported sig class is used.
++ * g10/sig-check.c (check_key_signature2): If SIG->CLASS is
++ unsupported, show some debugging information. Don't use BUG to fail.
++ Just return GPG_ERR_BAD_SIGNATURE.
++
++ gpg: More carefully encode a packet's length.
++ * g10/build-packet.c (write_header2): Make sure the length bits are
++ cleared. Fail if HDRLEN is set and the specified length can't be
++ encoded in the available space.
++
++ gpg: Avoid directly twiddling bits.
++ * g10/build-packet.c (do_plaintext): Use ctb_new_format_p to check the
++ packet's format.
++ (write_header2): Likewise.
++
++ gpg: Add some asserts.
++ * g10/build-packet.c (ctb_new_format_p): New function.
++ (ctb_pkttype): New function.
++ (do_user_id): Add some asserts.
++ (do_key): Likewise.
++ (do_symkey_enc): Likewise.
++ (do_pubkey_enc): Likewise.
++ (do_plaintext): Likewise.
++ (do_encrypted): Likewise.
++ (do_encrypted_mdc): Likewise.
++ (do_compressed): Likewise.
++ (do_signature): Likewise.
++ (do_signature): Likewise.
++ (write_header2): Likewise.
++
++ gpg: Avoid an unnecessary copy.
++ * g10/build-packet.c (sig_to_notation): Avoid an unnecessary copy of
++ the data: the size of the packet is fixed.
++
++2016-02-23 Neal H. Walfield <neal at g10code.com>
++
++ common: Reduce buffer size.
++ * common/iobuf.c (iobuf_copy): Change buffer size from 1 MB to 32 KB.
++
++ common: Improve a function's documentation and comments.
++ * common/iobuf.c (iobuf_set_partial_body_length_mode): Fix
++ documentation and comment. Add an assert.
++
++ common: Add log_assert.
++ * common/logging.h (log_assert): New macro.
++
++ gpg: Use higher-level functions.
++ * g10/build-packet.c (do_symkey_enc): Use iobuf_write instead of
++ iobuf_put in a loop. Use iobuf_copy instead of iobuf_read and
++ iobuf_write in a loop. Move the memory wiping from here...
++ * common/iobuf.c (iobuf_copy): ... to here.
++
++ common: Check for an error before reading.
++ * common/iobuf.c (iobuf_copy): If DEST has a pending error, don't
++ start copying.
++
++ common: More accurately name function.
++ * common/iobuf.c (iobuf_set_partial_block_mode): Rename from this...
++ (iobuf_set_partial_body_length_mode): ... to this. Update callers.
++
++2016-02-23 Werner Koch <wk at gnupg.org>
++
++ g13: Add commands --suspend and --remove.
++ * g13/g13.c (aSuspend, aResume): New.
++ (opts): Add commands --suspend and --resume.
++ (main): Implement dummy command aUmount. Implement commands aResume
++ and aSuspend.
++ * g13/sh-cmd.c (cmd_suspend): New.
++ (cmd_resume): New.
++ (register_commands): Add commands RESUME and SUSPEND.
++ * g13/server.c (cmd_suspend): New.
++ (cmd_resume): New.
++ (register_commands): Add commands RESUME and SUSPEND.
++ * g13/be-dmcrypt.c (be_dmcrypt_suspend_container): New.
++ (be_dmcrypt_resume_container): New.
++ * g13/backend.c (be_suspend_container): New.
++ (be_resume_container): New.
++ * g13/suspend.c, g13/suspend.h: New.
++ * g13/mount.c (parse_header, read_keyblob_prefix, read_keyblob)
++ (decrypt_keyblob, g13_is_container): Move to ...
++ * g13/keyblob.c: new file.
++ (keyblob_read): Rename to g13_keyblob_read and make global.
++ (keyblob_decrypt): Rename to g13_keyblob_decrypt and make global.
++ * g13/sh-dmcrypt.c (check_blockdev): Add arg expect_busy.
++ (sh_dmcrypt_suspend_container): New.
++ (sh_dmcrypt_resume_container): New.
++ * g13/call-syshelp.c (call_syshelp_run_suspend): New.
++ (call_syshelp_run_resume): New.
++
++ g13: Run mount after dmsetup.
++ * g13/g13-syshelp.c (main): Reject userids with a slash.
++ * g13/sh-dmcrypt.c (sh_dmcrypt_mount_container): Run mount if a
++ mountpoint is known.
++
++2016-02-23 Justus Winter <justus at g10code.com>
++
++ tests/openpgp: Qualify executables with extension.
++ * tests/openpgp/Makefile.am (required_pgms): Qualify executables with
++ '$EXEEXT'.
++
++ tests/openpgp: Reimplement 'pinentry.sh' in c.
++ * tests/openpgp/Makefile.am: Build new program.
++ * tests/openpgp/defs.inc: Use the new program.
++ * tests/openpgp/fake-pinentry.c: New file.
++
++ tests/openpgp: Avoid dependency on source files.
++ * tests/openpgp/plain-largeo.asc: New file.
++ * tests/openpgp/version.test: Dearmor the new file instead of relying
++ on the source being present.
++
++ tests/openpgp: Fix file removal.
++ * tests/openpgp/version.test: Fix file removal.
++
++ common/exechelp: Provide a way to wait for multiple processes.
++ * common/exechelp-posix.c (gnupg_wait_process): Generalize to
++ 'gnupg_wait_processes'.
++ * common/exechelp-w32.c (gnupg_wait_process): Likewise.
++ * common/exechelp-w32ce.c (gnupg_wait_process): New function stub.
++ * common/exechelp.h (gnupg_wait_process): New prototype.
++
++ common/exechelp: Add general pipe function.
++ * common/exechelp-posix.c (gnupg_create_pipe): New function.
++ * common/exechelp-w32.c (INHERIT_{READ,WRITE,BOTH}): New macros.
++ (create_inheritable_pipe): Generalize so that both ends can be
++ inherited.
++ (do_create_pipe): Rename argument accordingly.
++ (gnupg_create_{in,out}bound_pipe): Use new flags.
++ (gnupg_create_pipe): New function.
++ (gnupg_spawn_process): Use new flags.
++ * common/exechelp-w32ce.c (gnupg_create_pipe): New stub.
++ * common/exechelp.h (gnupg_create_pipe): New prototype.
++
++ common/exechelp: Mute the Windows version.
++ * common/exechelp-w32.c (gnupg_wait_process): Do not print an error if
++ the exit code can be returned. This makes the Windows version behave
++ like the POSIX version.
++
++ common/exechelp: Avoid magic numbers.
++ * common/exechelp-w32.c (do_create_pipe): Use symbolic names.
++
++ common/exechelp: Disable debugging by default.
++ * common/exechelp-w32.c (DEBUG_W32_SPAWN): Set to 0.
++
++ common/exechelp: Fix handle leak.
++ * common/exechelp-w32.c (gnupg_spawn_process_detached): Close process
++ handle.
++
++ common/exechelp: Fix opening the 'nul' device.
++ * common/exechelp-w32.c (gnupg_spawn_process): Fix opening the 'nul'
++ device.
++
++ common/exechelp: Fix error handling.
++ * common/exechelp-w32.c (gnupg_spawn_process): Close the right handle.
++
++ common/exechelp: Fix pipe creation.
++ * common/exechelp-w32.c (gnupg_spawn_process): Fix the creation of the
++ input pipe.
++
++ tools/mk-tdata: Fix data generation on Windows.
++ * tools/mk-tdata.c (main): Set stdout to binary mode to avoid newline
++ conversion.
++
++2016-02-19 Neal H. Walfield <neal at g10code.com>
++
++ gpg: Systematically detect and fix signatures that are out of order.
++ * g10/keyedit.c (sig_comparison): New function.
++ (fix_key_signature_order): Merge functionality into...
++ (check_all_keysigs): ... this function. Rewrite to eliminate
++ duplicates and use a systematic approach to detecting and moving
++ signatures that are out of order instead of a heuristic.
++ (fix_keyblock): Don't call fix_key_signature_order. Call
++ check_all_keysigs instead after collapsing the uids.
++
++ gpg: Split check_key_signature2.
++ * g10/sig-check.c (hash_uid_node): Rename from this...
++ (hash_uid_packet): ... to this. Take a PKT_user_id instead of a
++ KBNODE.
++ (check_key_signature2): Split the basic signature checking
++ functionality into...
++ (check_signature_over_key_or_uid): ... this new function.
++
++ gpg: Split print_and_check_one_sig.
++ * g10/keyedit.c (print_and_check_one_sig): Split the print
++ functionality into...
++ (print_one_sig): ... this new function.
++
++ gpg: Split the function check_signature_end.
++ * g10/sig-check.c (check_signature_end): Break the basic signature
++ check into...
++ (check_signature_end_simple): ... this new function.
++
++ gpg: Use format_keyid rather than manually formatting the keyid.
++ * g10/keyedit.c (menu_addrevoker): Use format_keyid rather than
++ manually formatting the keyid.
++ * g10/keygen.c (card_write_key_to_backup_file): Likewise.
++
++ gpg: Initialize the primary key when generating a key.
++ * g10/keygen.c (do_generate_keypair): Initialize
++ pri_psk->flags.primary, pri_psk->keyid and pri_psk->main_keyid.
++
++ gpg: Add accessor & utility functions for pk->keyid and pk->main_keyid.
++ * g10/keydb.h (keyid_cmp): New function.
++ * g10/keyid.c (pk_keyid): New function.
++ (pk_main_keyid): New function.
++ (keyid_copy): New function.
++ (pk_keyid_str): New function.
++ * g10/packet.h (PKT_public_key): Update comments for main_keyid and
++ keyid.
++
++2016-02-18 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
++
++ gpgparsemail: Allow weirdly-mixed pkcs7 signatures.
++ * tools/gpgparsemail.c: Add and check info->signing_protocol_2.
++
++ gpg: Clean up dangling agent_open and agent_closed declarations.
++ * g10/keydb.h: Remove agent_open, agent_close declarations/
++ * g10/migrate.c: #include <unistd.h> for access()
++
++2016-02-16 Werner Koch <wk at gnupg.org>
++
++ w32: Make scdaemon build again due to libusb problem.
++ * configure.ac: Add hack to disable libusb for Windows. Also use
++ $host instead of $target in the switch
++ --
++
++ The new test for libusb does not support cross-compiling. As a quick
++ workaround we disable libusb for Windows because we can't use it anyway.
++
++ w32: Do not error out if gpgconf is not installed.
++ * common/homedir.c (check_portable_app): Remove error message.
++
++2016-02-16 Neal H. Walfield <neal at g10code.com>
++
++ gpg: Make ASCII armor decoding more robust to encoding errors.
++ * g10/armor.c (radix64_read): If the = is followed by the string "3D",
++ check if the following four characters are valid radix 64 and are
++ followed by a new line. If so, warn and ignore the '3D'.
++
++2016-02-16 Werner Koch <wk at gnupg.org>
++
++ doc: Add a gnupg-module-overview picture.
++ * doc/gnupg-module-overview.svg: New.
++ * doc/debugging.texi (Component interaction): New.
++ * doc/Makefile.am (EXTRA_DIST): Add PNG and PDF versions of
++ gnupg-module-overview.svg. Remove two eps files.
++ (BUILT_SOURCES): Add gnupg-module-overview.pdf and .png. Remove
++ gnupg-card-architecture.epsl
++ (gnupg_TEXINFOS): Add gnupg-module-overview.svg
++ (gnupg.dvi): New.
++ (DISTCLEANFILES): Remove build eps files.
++
++2016-02-15 NIIBE Yutaka <gniibe at fsij.org>
++
++ common, g10: Fix indentation to silence GCC-6.
++ * common/iobuf.c (iobuf_ioctl): Fix.
++ * g10/encrypt.c (encrypt_filter): Likewise.
++ * g10/keyring.c (prepare_search): Likewise.
++
++ dirmngr: fix for memory alignment.
++ * dirmngr/dns-stuff.c (get_dns_cert): Cast through void *.
++ (getsrv, get_dns_cname): Make sure it's aligned for HEADER.
++
++2016-02-14 Werner Koch <wk at gnupg.org>
++
++ gpg: Add hidden key-edit subcommand "change-usage".
++ * g10/keyedit.c (cmdCHANGEUSAGE): New.
++ (cmds): Add command "change-usage".
++ (keyedit_menu): Handle that command.
++ (menu_changeusage): New.
++ * g10/keygen.c (keygen_add_key_flags): New.
++ (ask_key_flags): Add optional arg current.
++
++2016-02-14 Neal H. Walfield <neal at g10code.com>
++
++ gpg: Improve API documentation.
++ * g10/seskey.c (make_session_key): Improve documentation.
++ (encode_session_key): Improve documentation.
++ * g10/encrypt.c (encrypt_seskey): Remove gratuitous initialization.
++ * g10/dek.h (DEK): Improve documenation.
++
++ gpg: Fix calc_header_length when LEN is 0 and improve documentation.
++ * g10/build-packet.c (calc_header_length): Return the correct haeder
++ size when LEN is 0. Fix documentation.
++
++ gpg: Fix format_keyid when dynamically allocating the buffer.
++ * g10/keyid.c (format_keyid): Return a char *, not a const char *. If
++ BUFFER is NULL, then set LEN to the static buffer's size.
++
++ common: Fix comment.
++ * common/iobuf.c (iobuf_flush_temp): Fix comment.
++
++2016-02-13 Werner Koch <wk at gnupg.org>
++
++ g13: Require a confirmation before g13 is used for DM-Crypt.
++ * g13/g13-syshelp.c (g13_syshelp_i_know_what_i_am_doing):
++ * g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Call it.
++ (sh_dmcrypt_mount_container): Call it.
++
++ g13: Second chunk of code to support dm-crypt.
++ * g13/be-dmcrypt.c, g13/be-dmcrypt.h: New.
++ * g13/Makefile.am (g13_SOURCES): Add them.
++ * g13/backend.c: Include be-dmcrypt.h and call-syshelp.h.
++ (no_such_backend): Rename to _no_such_backend and provide replacement
++ macro.
++ (be_is_supported_conttype): Support DM-Crypt.
++ (be_take_lock_for_create): Call set_segvice for DM-Crypt.
++ (be_create_new_keys): Make it a dummy for DM-Crypt.
++ (be_create_container): Call be_dmcrypt_create_container.
++ (be_mount_container): call be_dmcrypt_mount_container.
++ * g13/g13-syshelp.c (main): Enable verbose mode.
++ * g13/g13tuple.c (get_tupledesc_data): New.
++ * g13/g13tuple.h (unref_tupledesc): New.
++ * g13/g13.h (server_control_): Add field "recipients".
++ * g13/g13.c (main): Fix setting of recipients via cmdline.
++ (g13_deinit_default_ctrl): Release recipients list.
++ (g13_request_shutdown): New. Replace all direct update of
++ shutdown_pending by calls this function.
++ * g13/server.c (server_local_s): Remove field recipients which is now
++ part of CTRL.
++ (reset_notify, cmd_recipient, cmd_create): Adjust for this change.
++ * g13/create.c (encrypt_keyblob): Rename to g13_encrypt_keyblob.
++ (g13_create_container): Support DM-Crypt.
++ * g13/mount.c (parse_header): Allow for meta data copies.
++ (g13_mount_container): Support DM-Crypt.
++ * g13/sh-cmd.c (cmd_create): Make it work.
++ (cmd_mount): New.
++ * g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Make it work.
++ (sh_dmcrypt_mount_container): New.
++
++ g13: Improve dump_keyblob.
++ * g13/g13tuple.c: Include keyblob.h.
++ (find_tuple_uint): Factor code out to ...
++ (convert_uint): new.
++ (all_printable): New.
++ * g13/mount.c (dump_keyblob: Move and rename to ...
++ * g13/g13tuple.c (dump_tupledesc): here. Revamp and pretyy print uint
++ values.
++
++ g13: Define 3 new tags.
++ * g13/keyblob.h (KEYBLOB_TAG_CONT_NSEC): New.
++ (KEYBLOB_TAG_ENC_NSEC): New.
++ (KEYBLOB_TAG_ENC_OFF): New.
++
++ g13: Rename utils.c to g13tuple.c.
++ * g13/utils.c: Rename to g13tuple.c.
++ * g13/utils.h: Rename to g13tuple.h. Change all users.
++ * g13/Makefile.am: Adjust accordingly
++
++ g13: Add functions to handle uint in a keyblob.
++ * g13/utils.c (append_tuple_uint): New.
++ (find_tuple_uint): New.
++ * g13/t-utils.c: New.
++ * g13/Makefile.am (noinst_PROGRAMS, TESTS): New.
++ (module_tests, t_common_ldadd): New.
++ (t_utils_SOURCES, t_utils_LDADD): New.
++
++ g13: Re-factor high level create code.
++ * g13/create.c (g13_create_container): Factor some code out to ...
++ * g13/backend.c (be_take_lock_for_create): new.
++
++ g13: Return an error for non-existing device.
++ * g13/sh-cmd.c (cmd_device): Set ERR.
++
++ g13: Fix releasing of a syshelp context.
++ * g13/call-syshelp.c (call_syshelp_release): Allow a NULL arg.
++
++ g13: Switch over to common/exectool.c.
++ * g13/sh-exectool.c: Remove. It has been replaced by common/exectool.c.
++ * g13/Makefile.am (g13_syshelp_SOURCES): Remove sh-exectool.c
++ * g13/sh-blockdev.c: Include exectool.h. Change sh_exec_tool to
++ gnupg_exec-tool.
++ * g13/sh-dmcrypt.c: Ditto.
++
++ common: Make gnupg_exec_tool conform to spec.
++ * common/exectool.c (gnupg_exec_tool): Allocate extra byte. Allow
++ zero length read. Append hidden byte. Release memory on error.
++
++ g13: First chunk of code to support dm-crypt.
++ * g13/call-syshelp.c, g13/call-syshelp.h: New.
++ * g13/g13-syshelp.c, g13/g13-syshelp.h: New.
++ * g13/sh-cmd.c: New.
++ * g13/sh-blockdev.c: New.
++ * g13/sh-exectool.c: New.
++ * g13/sh-dmcrypt.c: New.
++ * g13/Makefile.am (sbin_PROGRAMS): Add g13-syshelp.c
++ (g13_syshelp_SOURCES): New.
++ (g13_syshelp_LDADD): New.
++
++ * g13/g13.c (opts): Add option --type.
++ (g13_deinit_default_ctrl): New.
++ (main): Implement that option. Call g13_deinit_default_ctrl.
++ * g13/g13.h (struct call_syshelp_s): New declaration.
++ (server_control_s): Add field syshelp_local.
++ * g13/keyblob.h (KEYBLOB_TAG_CREATED): New.
++ (KEYBLOB_TAG_ALGOSTR): New.
++ (KEYBLOB_TAG_HDRCOPY): New.
++ * g13/backend.c (be_parse_conttype_name): New.
++ (be_get_detached_name): Add CONTTYPE_DM_CRYPT.
++
++ tests: Remove some harmless warnings in regression tests.
++ * tests/openpgp/gpg-agent.conf.tmpl: Remove --use-standard-socket.
++
++2016-02-12 Neal H. Walfield <neal at g10code.com>
++
++ common: Change simple_query to ignore status messages.
++ * common/simple-pwquery.c (simple_query): Ignore status messages.
++
++2016-02-12 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10: Make sure to have the directory for trustdb.
++ * g10/tdbio.c (tdbio_set_dbname): Return earlier if !CREATE. Check
++ the directory and create it if none before calling take_write_lock.
++
++2016-02-02 Neal H. Walfield <neal at g10code.com>
++
++ doc: Note that rngd can also be used to quickly generate insecure keys.
++ * doc/gpg-agent.texi (Agent Options): Add comment to the description
++ of --debug-quick-random that rngd can also be used to quickly generate
++ key.
++
++2016-01-27 Werner Koch <wk at gnupg.org>
++
++ scd: Fix size_t/int mismatch in libusb.
++ * scd/ccid-driver.c (bulk_in, abort_cmd, ccid_poll): Change msglen to
++ int.
++
++ scd: Fix detection of libusb.
++ * configure.ac (HAVE_LIBUSB): Clear if no header file was found.
++ (LIBUSB_LIBS): Ditto.
++
++ dirmngr: Build fix for FreeBSD (EAI macros)
++ * dirmngr/dns-stuff.c (map_eai_to_gpg_error): Map EAI_NODATA and
++ EAI_ADDRFAMILY only if defined.
++
++2016-01-27 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Migrate to new API of libusb 1.0.
++ * configure.ac (LIBUSB_CPPFLAGS): New.
++ * scd/Makefile.am (AM_CPPFLAGS): Add LIBUSB_CPPFLAGS.
++ * scd/ccid-driver.c: Use libusb 1.0 API.
++
+2016-01-26 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.11.
+
+2016-01-26 Andre Heinecke <aheinecke at intevation.de>
+
+ gpgtar,w32: Fix gpgtar 8 bit encoding handling on W32.
+ * common/utf8conv.c (wchar_to_utf8): Factor code out to ...
+ (wchar_to_cp): new.
+ (utf8_to_wchar): Factor code out to ...
+ (cp_to_wchar): new.
+ (wchar_to_native): New.
+ (native_to_wchar): New.
+ * tools/gpgtar-create.c (fillup_entry_w32): Use native_to_wchar.
+ (scan_directory): Use wchar_to_native.
+
+2016-01-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix segfault on unsupported curve.
+ * g10/call-agent.c (learn_status_cb): Don't use NULL for strcmp.
+
+ sm: small fix for GCC 6.
+ * sm/export.c (insert_duptable): Use unsigned 0.
+
+2016-01-25 Werner Koch <wk at gnupg.org>
+ Daiki Ueno <ueno at gnu.org>
+
+ gpg: Print PROGRESS status lines during key generation.
+ * g10/call-agent.c (cache_nonce_status_cb): Rewrite by using
+ has_leading_keyword. Handle PROGRESS lines.
+
+2016-01-25 Werner Koch <wk at gnupg.org>
+
+ agent: Send PROGRESS status lines to the client.
+ * agent/gpg-agent.c (struct progress_dispatch_s): New.
+ (progress_dispatch_list): New.
+ (main): Register libgcrypt pogress handler.
+ (agent_libgcrypt_progress_cb): New.
+ (agent_set_progress_cb): New.
+ (unregister_progress_cb): New.
+ (agent_deinit_default_ctrl): Call unregister.
+ * agent/command.c (progress_cb): New.
+ (start_command_handler): Register progress callback.
+
+ speedo: Allow use of SHA-256 checksums.
+ * build-aux/getswdb.sh: Add option --find-sha256sum.
+ * build-aux/speedo.mk (libgpg_error_sha2): New var. Also for all
+ other packages.
+ (SHA2SUM): New.
+ (SETVARS, SETVARS_W64): Prefer sha256sum over sha1sum.
+ (installer-from-source): Create swdb fragment.
+
+2016-01-22 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Indicate that serial numbers are hexadecimal.
+ * dirmngr/misc.c (hexify_data): Add arg with_prefix. Adjust all
+ callers.
+ * dirmngr/crlcache.c (cache_isvalid): Print "0x" in front of the S/N.
+
+ dirmngr: Provide the keyserver pool name even if there is no CNAME.
+ * dirmngr/ks-engine-hkp.c (map_host): Fix setting of r_poolname.
+
+2016-01-22 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+ wk at gnupg.org
+
+ dirmngr: Use sks-keyservers CA by default for the hkps pool.
+ * dirmngr/Makefile.am (dist_pkgdata_DATA): Add sks-keyservers.netCA.pem.
+ * dirmngr/http.c (http_session_new): Add optional arg
+ intended_hostname and set a default cert.
+ * dirmngr/ks-engine-hkp.c (send_request): Pass httphost to
+ http_session_new.
+
+2016-01-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow new user ids with only the mail address.
+ * g10/keygen.c (ask_user_id): Allow empty name.
+
+2016-01-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve header text of the auto-created revocations.
+ * g10/revoke.c (gen_standard_revoke): Improve header text for the
+ file. Add info output.
+
+ gpg: Make --auto-key-retrieve work with dirmngr configured server.
+ * g10/call-dirmngr.c (gpg_dirmngr_ks_list): Make R_KEYSERVER optional.
+ * g10/keyserver.c (keyserver_any_configured): New.
+ (keyserver_put): Remove arg keyserver because this will always receive
+ opt.keyserver which is anyway used when connecting dirmngr. Do not
+ check opt.keyserver.
+ (keyserver_import_cert): Replace opt.keyserver by
+ keyserver_any_configured.
+ * g10/mainproc.c (check_sig_and_print): Ditto.
+ * g10/import.c (revocation_present): Ditto.
+ * g10/getkey.c (get_pubkey_byname): Ditto.
+ * g10/gpgv.c (keyserver_any_configured): Add stub.
+ * g10/test-stubs.c (keyserver_any_configured): Add stub.
+
+2016-01-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence message about ignoring revoked user ids.
+ * g10/trustdb.c (tdb_get_validity_core): Print message only in debug
+ mode.
+
+ agent: New option --pinentry-timeout.
+ * agent/gpg-agent.c (oPinentryTimeout): New.
+ (opts): Add new option.
+ (parse_rereadable_options): PArse that option.
+ (main): Tell gpgconf about this option.
+ * agent/call-pinentry.c (start_pinentry): Send option to Pinentry.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add Option.
+
+2016-01-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Streamline use of error messages in tofu.c.
+ * g10/tofu.c: Make use of print_further_info to reduce the number of
+ different error messages to be translated. Also streamline some
+ messages.
+
+ common: Add substitute code for libgpg-error < 1.22.
+ * common/util.h (GPG_ERR_DB_CORRUPTED): New.
+
+ gpg: Add function print_further_info.
+ * g10/misc.c (print_further_info): New.
+
+2016-01-18 Werner Koch <wk at gnupg.org>
+
+ g10: Improve strings printed by tofu.c.
+ * g10/tofu.c: Include ttyio.h. Change many strings to help
+ translating. Make use of ngettext wehere needed.
+ (CONTROL_L): New.
+ (TIME_AGO_UNIT_SMALL_NAME): Remove this and all similar *_NAME macros.
+ (time_ago_unit): Remove.
+ (get_trust): Use tty_prints and cpr_get only for the actual prompt.
+ Add Ctrl-L hack.
+ (show_statistics): Use two English strings for singular and plural.
+
+ * po/POTFILES.in: Add tofu.c.
+
+ gpg: Use "days" in "...newer than..." diagnostics.
+ * g10/sig-check.c (check_signature_metadata_validity): Use days if
+ useful.
+
+ Use ngettext for some strings.
+ * scd/app-openpgp.c (build_enter_admin_pin_prompt): Use ngettext for
+ some diagnostics.
+ (do_genkey): Ditto.
+ * g10/keyedit.c (check_all_keysigs, menu_delsig, menu_clean): Ditto.
+ * g10/keylist.c (print_signature_stats): Ditto.
+ * g10/keyserver.c (keyserver_refresh): Ditto.
+ * g10/sig-check.c (check_signature_metadata_validity): Ditto.
+ * g10/sign.c (do_sign): Ditto.
+ * g10/trustdb.c (reset_trust_records): Ditto.
+ (validate_keys): Use a table like diagnostic output.
+
+2016-01-15 Werner Koch <wk at gnupg.org>
+
+ kbx,w32: Use shorter retry intervals for keybox_file_rename.
+ * kbx/keybox-util.c (keybox_file_rename): Restart retry intervals
+ after 800ms.
+
+2016-01-14 Werner Koch <wk at gnupg.org>
+
+ w32: Fix deadlock introduced by keybox_file_rename.
+ * g10/keyring.c (keyring_lock) [W32]: Flush the close cache before
+ locking.
+ * kbx/keybox-init.c (keybox_lock) [W32]: Close the file before
+ locking.
+
+ gpg: Detect race between pubring.gpg and pubring.kbx use.
+ * g10/keydb.c (maybe_create_keyring_or_box): Detect race condition.
+
+ kbx: New function keybox_file_rename to replace rename.
+ * kbx/keybox-util.c: Include windows.h.
+ (keybox_file_rename): New.
+ * kbx/keybox-update.c (rename_tmp_file): Replace remove+rename by
+ keybox_file_rename.
+ * g10/keyring.c (rename_tmp_file): Ditto.
+
+ kbx: Add function keybox_tmp_names to avoid code duplication.
+ * kbx/keybox-update.c (create_tmp_file): Move some code to...
+ * kbx/keybox-util.c (keybox_tmp_names): new.
+ * g10/keyring.c: Include keybox.h.
+ (create_tmp_file): Replace parts by keybox_tmp_names.
+
+ gpg: Make --list-options show-usage the default.
+ * g10/gpg.c (main): Add LIST_SHOW_USAGE.
+
+2016-01-13 Werner Koch <wk at gnupg.org>
+
+ kbx: Change return type of search functions to gpg_error_t.
+ * kbx/keybox-search.c (keybox_search_reset): Change return type to
+ gpg_error_t.
+ (keybox_search): Ditto. Also handle GPG_ERR_EOF.
+ * sm/keydb.c (keydb_search_reset): Ditto.
+
+ gpg: Improve error code from lock_all.
+ * g10/keydb.c (lock_all): Do not clobber RC during failur cleanup.
+
+ kbx: Improve and fix keybox_lock.
+ * kbx/keybox-init.c (keybox_lock): Make sure ERR is initialized. Get
+ error codes from dotlock functions.
+
+ common: Make sure dotlock functions set a proper ERRNO.
+ * common/dotlock.c (map_w32_to_errno): New.
+ (read_lockfile): Return a proper ERRNO.
+ (dotlock_create_unix): Do not let log functions clobber ERRNO.
+ (dotlock_take_unix): Ditto.
+ (dotlock_release_unix): Ditto.
+ (dotlock_create_w32): Set proper ERRNO.
+ (dotlock_take_w32): Ditto.
+ (dotlock_release_w32): Ditto.
+
+ kbx: Implement keybox_lock for use by gpg.
+ * kbx/keybox-defs.h: Include dotlock.h and logging.h.
+ (CONST_KB_NAME): Remove. Replace usage by KB_NAME.
+ (struct keybox_name): Add field "lockhd".
+ * kbx/keybox-init.c (keybox_register_file): Init LOCKHD.
+ (keybox_lock): Chnage to return gpg_error_t. Implement locking.
+
+ gpg: Make sure to mark a duplicate registered keybox as primary.
+ * kbx/keybox-init.c (keybox_register_file): Change interface to return
+ the token even if the file has already been registered.
+ * g10/keydb.c (primary_keyring): Rename to primary_keydb.
+ (maybe_create_keyring_or_box): Change return type to gpg_error_t.
+ (keydb_add_resource): Ditto. s/rc/err/.
+ (keydb_add_resource): Mark an already registered as primary.
+ * sm/keydb.c (maybe_create_keybox): Change return type to gpg_error_t.
+ (keydb_add_resource): Ditto. s/rc/err/.
+ (keydb_add_resource): Adjust for changed keybox_register_file.
+
+2016-01-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ Fix to support git worktree.
+ * autogen.sh, Makefile.am, doc/Makefile.am: Use -e for testing .git.
+
+2016-01-12 Werner Koch <wk at gnupg.org>
+
+ ssh: Accept OpenSSH *cert-v01 key variants.
+ * agent/command-ssh.c (SPEC_FLAG_WITH_CERT): New.
+ (ssh_key_types): Add OpenSSH cert types.
+ (stream_read_string): Allow a dummy read.
+ (ssh_receive_mpint_list): Pass SPEC by reference.
+ (ssh_receive_mpint_list): New arg CERT and use it.
+ (ssh_receive_key): Read certificate into an estream object and modify
+ parser to make use of that object.
+
+2016-01-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ common: Fix iobuf API of filter function for alignment.
+ * common/iobuf.h: Fix comment.
+
+ common: Fix iobuf API of filter function for alignment.
+ * common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
+ * common/iobuf.c (iobuf_desc): Add the second argument DESC.
+ (print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
+ (iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
+ of iobuf_desc.
+ (file_filter, file_es_filter, sock_filter, block_filter): Fill the
+ description.
+ * common/t-iobuf.c (every_other_filter, double_filter): Likewise.
+ * g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
+ g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
+ g10/textfilter.c: Likewise.
+
+2016-01-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix NULL de-ref for ambiguous key check in --export-ssh-keys.
+ * g10/getkey.c: Allow arg RET_KEYBLOCK to be NULL.
+
+2016-01-09 Werner Koch <wk at gnupg.org>
+
+ tools: Remove gpgkey2ssh.
+ * tools/gpgkey2ssh.c: Remove.
+ * tools/Makefile.am (bin_PROGRAMS): Ditto.
+
+2016-01-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Support ECDSA keys with --export-ssh-key.
+ * g10/export.c (key_to_sshblob): Add hack for ECDSA.
+
+ gpg: New command --export-ssh-key.
+ * g10/export.c: Include membuf.h and host2net.h.
+ (key_to_sshblob): New.
+ (export_ssh_key): New.
+ * g10/gpg.c (aExportSshKey): New.
+ (opts): Add command.
+ (main): Implement that command.
+
+ gpg: Add an exact search flag to the PK struct.
+ * g10/getkey.c (merge_selfsigs_subkey): Clear exact flag.
+ (finish_lookup): Set exact flag.
+ * g10/packet.h (PKT_public_key): Add field flags.exact.
+
+ Print warnings if old daemon versions are used.
+ * common/status.h (STATUS_WARNING): New.
+ * g10/call-agent.c (warn_version_mismatch): New.
+ (start_agent): Call warn function.
+ * g10/call-dirmngr.c: Include status.h.
+ (warn_version_mismatch): New.
+ (create_context): Call warn function.
+ * sm/call-agent.c (warn_version_mismatch): New.
+ (start_agent): Call warn function.
+ (gpgsm_agent_learn): Call warn function.
+ * sm/call-dirmngr.c (warn_version_mismatch): New.
+ (prepare_dirmngr): Call warn function.
+
+ common: New function compare_version_strings.
+ * common/stringhelp.c (parse_version_number): New.
+ (parse_version_string): New.
+ (compare_version_strings): New.
+ * common/t-stringhelp.c (test_compare_version_strings): New.
+ (main): Call test. Return ERRCOUNT instead of 0.
+
+ common: New function get_assuan_server_version.
+ * common/asshelp.c: Include membuf.h.
+ (get_assuan_server_version): New.
+ * g10/call-agent.c (agent_get_version): Use new function.
+
+ common: New put_membuf_cb to replace static membuf_data_cb.
+ * common/membuf.c (put_membuf_cb): New.
+ * agent/call-scd.c (membuf_data_cb): Remove. Change callers to use
+ put_membuf_cb.
+ * common/get-passphrase.c (membuf_data_cb): Ditto.
+ * g10/call-agent.c (membuf_data_cb): Ditto.
+ * sm/call-agent.c (membuf_data_cb): Ditto.
+
+2016-01-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Return an error code from keygrip_from_pk.
+ * g10/keyid.c (keygrip_from_pk): Return an error code.
+
+ gpg: Avoid warnings about possible NULL deref.
+ * g10/getkey.c (cache_public_key): Protect deref of CE which actually
+ can't happen.
+ * g10/keygen.c (quickgen_set_para): s/sprintf/snprintf/.
+ * g10/tofu.c (end_transaction, rollback_transaction): Allow NULL for
+ DB.
+ * g10/trustdb.c (update_min_ownertrust): Remove useless clearling of
+ ERR.
+
+ gpg: Fix warnings about useless assignments.
+ * g10/armor.c (parse_hash_header): Remove duplicate var assignment.
+ * g10/getkey.c (cache_user_id): Ditto.
+ * g10/keygen.c (ask_curve): Ditto. This also fixes a small memory
+ leak.
+
+ * g10/keygen.c (proc_parameter_file): Remove useless assignment or
+ pointer increment.
+ (generate_keypair): Ditto.
+ * g10/getkey.c (finish_lookup, lookup): Ditto.
+ * g10/card-util.c (change_pin): Ditto.
+ * g10/gpg.c (main) <aVerify>: Ditto.
+ * g10/import.c (import): Ditto.
+ (print_import_check): Ditto
+ * g10/keyring.c (do_copy): Ditto.
+ * g10/tdbio.c (tdbio_read_record): Ditto.
+ * g10/trustdb.c (tdb_update_ownertrust): Ditto.
+ (update_validity): Ditto.
+
+ * g10/server.c (cmd_passwd): Remove useless call to skip_options.
+
+ sm: Avoid warnings about useless assignments.
+ * sm/call-dirmngr.c (prepare_dirmngr): Remove setting of ERR.
+ (unhexify_fpr): Remove useless computation on N.
+ * sm/certchain.c (do_validate_chain): Remove clearing of RC. Remove
+ useless setting of RC.
+ * sm/fingerprint.c (gpgsm_get_keygrip): Remove setting of RC.
+ * sm/gpgsm.c (build_list): Replace final stpcpy by strcpy.
+ * sm/keydb.c (keydb_clear_some_cert_flags): Remove clearing of RC.
+ * sm/server.c (cmd_getauditlog): Comment unused skip_options.
+
+ kbx: Avoid warnings about useless assignments.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Remove setting of IN_RANGE
+ and the last increment of P.
+
+ gpg: Fix DNS cert lookup returning an URL.
+ * g10/call-dirmngr.c (dns_cert_status_cb): Store URL status in the URL
+ param. The old code was entirely buggy (c+p error).
+
+2016-01-06 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Fix keystrlen to work when OPT.KEYID_FORMAT is KF_DEFAULT.
+ * g10/keyid.c (keystrlen): If opt.keyid_format is KF_DEFAULT unset,
+ default to KF_SHORT.
+ (format_keyid): Default to KF_SHORT, not KF_0xLONG.
+
+2016-01-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence some regression tests.
+ * g10/test.c (TEST): Print diagnostics only in verbose mode.
+
+ gpg: Avoid using an uninitialized SALT on premature EOF.
+ * g10/parse-packet.c (parse_key): Check for premature end of salt.
+
+ gpg: Silence warnings found by static analyzer.
+ * g10/keyedit.c (change_passphrase): Remove useless init of ANY.
+ (keyedit_quick_adduid): Remove useless setting of ERR.
+ * g10/parse-packet.c (parse_key): Remove PKTLEN from condition because
+ it has been checked before the loop.
+ (parse_plaintext): Remove useless init of PKTLEN.
+
+ kbx: Avoid faulty fclose in an error case.
+ * kbx/keybox-update.c (blob_filecopy): Do not close an uninitialized
+ file pointer after a failure to create a temp file.
+ * kbx/keybox-openpgp.c (next_packet): Remove duplicate assignment of
+ PKTLEN.
+
+ dirmngr: Silence one regression test.
+ * dirmngr/t-dns-stuff.c (main): Do not print info during standard
+ "make check".
+
+ common: Avoid warnings about useless assignments.
+ * common/b64enc.c (b64enc_finish): Remove var assignment which is not
+ used later.
+ * common/iobuf.c (file_filter): Ditto.
+ * common/tlv.c (do_find_tlv): Ditto.
+ * common/userids.c (classify_user_id): Ditto.
+
+ tests: Use info and error instead of a plain echo.
+ * tests/openpgp/4gb-packet.test: Use error and info.
+
+ common: Do not deref vars in tests after a fail().
+ * common/t-convert.c (test_bin2hex): Turn if conditions into if-else
+ chains to avoid accessing unchecked data.
+ (test_bin2hexcolon): Ditto.
+ * common/t-mapstrings.c (test_map_static_macro_string): Ditto.
+ * common/t-stringhelp.c (test_percent_escape): Ditto.
+ (test_make_filename_try): Ditto.
+ (test_make_absfilename_try): Ditto.
+ * common/t-timestuff.c (test_timegm): Ditto.
+
+2016-01-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Align notes about minimal keysize with actual checks.
+ * g10/keygen.c (ask_keysize): Use 768 for the minimal value for DSA in
+ export mode. Improve readability.
+
+2016-01-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix RSA verification for card.
+ * agent/pksign.c (agent_pksign_do): Use S-exp of public key, instead
+ of shadowed key.
+
+2016-01-04 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix double free.
+ * g10/getkey.c (get_pubkeys): Fix double free.
+
+2015-12-24 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: IMPORT_KEY with --force option fix.
+ * agent/cvt-openpgp.c (convert_from_openpgp_main): Add an option not
+ to check existing key.
+ (convert_from_openpgp): Ditto.
+ (convert_from_openpgp_native): Call convert_from_openpgp_main with
+ dontcare_exist=0.
+ * agent/command.c (cmd_import_key): Call with dontcare_exist=force.
+
+ g10: Use --force when importing key for bkuptocard.
+ * g10/call-agent.c (agent_import_key): Add an argument FORCE.
+ * g10/import.c (transfer_secret_keys): Likewise.
+ (import_secret_one): Call transfer_secret_keys with FORCE=0.
+ * g10/keyedit.c (keyedit_menu): Call with FORCE=1.
+
+ g10: Remove subcommand checkbkupkey for --key-edit.
+ * g10/keyedit.c (keyedit_menu): Remove cmdCHECKBKUPKEY support.
+
+ g10: Allow relative path for specifying the file for bkuptocard.
+ * g10/keyedit.c (keyedit_menu): Assume the file is under GNUPGHOME.
+ Also support tilda expansion.
+
+ g10: fix regression of bkuptocard subcommand in --edit-key.
+ * g10/keyedit.c (keyedit_menu): Call transfer_secret_keys.
+ * g10/import.c (transfer_secret_keys): Make it global function.
+ Allow stats==NULL.
+
+ agent: Support --force option for IMPORT_KEY.
+ * agent/command.c (cmd_keywrap_key): New option --force.
+
+2015-12-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Rename struct pubkey to pukey_s and add pubkey_t.
+ * g10/keydb.h (struct pubkey): Rename to pubkey_s.
+ (pubkey_t): New. Change all struct pubkey_s to use this type.
+ * g10/getkey.c (get_pubkeys): Rename arg keys to r_keys.
+
+ gpg: Simplify status message code from commit b30c15bf.
+ * g10/keygen.c (card_write_key_to_backup_file): Simplify by using
+ hexfingerprint.
+
+ gpg: Add standard free() semantic to pubkey_free.
+ * g10/getkey.c (pubkey_free): Check for NULL arg.
+
+ gpg: Fix use of assert from commit dc417bf0.
+ * g10/keydb.c (keydb_update_keyblock): De-ref after the assert. Use
+ %zu for size_t.
+
+ gpg: Do not translate debug output.
+ * g10/getkey.c (parse_def_secret_key): Do not make strings passed to
+ log_debug translatable.
+
+2015-12-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix commit b30c15bf (again).
+ * g10/keygen.c (do_generate_keypair): Clear the variable S.
+
+2015-12-22 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix type.
+ * g10/keygen.c (card_write_key_to_backup_file): Change n to a size_t.
+
+ gpg: Fix error message.
+ * g10/getkey.c (parse_def_secret_key): Fix error message.
+
+ gpg: Don't check for ambiguous keys.
+ * g10/gpg.c (struct result): Move from here...
+ * g10/keydb.h (struct pubkey): ... to here. Update users.
+ * g10/gpg.c (check_user_ids): Move from here...
+ * g10/getkey.c (get_pubkeys): ... to here. Update users. Use
+ get_pubkey_byname to look up the keys (this also prunes invalid keys).
+ (pubkey_free): New function.
+ (pubkeys_free): New function.
+ * g10/gpg.c (main): Don't check for ambiguous key specifications.
+
+ gpg: Lazily evaluate --default-key.
+ * g10/gpg.c (main): If --encrypt-to-default-key is specified, don't
+ add --default-key's value to REMUSR here...
+ * g10/pkclist.c (build_pk_list): ... do it here.
+ * tests/openpgp/Makefile.am (TESTS): Add default-key.test.
+ * tests/openpgp/default-key.test: New file.
+
+ gpg: Remove unused parameter.
+ * g10/pkclist.c (build_pk_list): Remove parameter use, which is always
+ called set to PUBKEY_USAGE_ENC. Update callers.
+
+ gpg: Improve check for ambiguous keys.
+ * g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
+ encryption-only keys when a signing key is needed and vice-versa.
+
+ gpg: Fix TOCTTOU when updating keyblocks.
+ * g10/keydb.c (keydb_update_keyblock): Don't replace the record at the
+ current offset. After taking the lock, extract the fingerprint from
+ the keyblock, find it and then replace it.
+
+ Only add the user supplied CFLAGS after running any autoconf tests.
+ * configure.ac: Only add the user supplied CFLAGS after running any
+ autoconf tests.
+
+ gpg: Suppress a warning.
+ * dirmngr/dns-stuff.c (enable_dns_tormode): Reference new_circuit to
+ avoid a warning when ADNS is not available.
+
+ gpg: Remove dead code.
+ * kbx/keybox-defs.h (struct keybox_found_s): Remove unused fields
+ offset and n_packets.
+
+ gpg: Display the key that is invalid, not the search description.
+ * g10/getkey.c (parse_def_secret_key): Display the key that is
+ invalid, not the search description.
+
+ gpg: Mark more options as coming from the config file (when this holds)
+ * g10/gpg.c (main): When --default-key or --encrypt-to-default-key is
+ taken from the config file, note this.
+
+ gpg: Use enums instead of defines.
+ * g10/keydb.h (PK_LIST_ENCRYPT_TO): Change from a macro to an enum.
+ (PK_LIST_HIDDEN): Likewise.
+ (PK_LIST_CONFIG): Likewise.
+ (PK_LIST_SHIFT): Likewise.n
+
+2015-12-21 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ g10: clean up of headers for card.
+ * g10/main.h (save_unprotected_key_to_card): Remove.
+ * g10/options.h (ctapi_driver, pcsc_driver, disable_ccid): Remove.
+
+2015-12-21 Werner Koch <wk at gnupg.org>
+
+ common: New file fwddecl.h.
+ * common/util.h (server_control_s, ctrl_t): Move to ...
+ * common/fwddecl.h: New file.
+ * common/call-gpg.h: Replace typedef by fwddecl.h. Change include
+ protection macro name.
+ * common/Makefile.am (common_sources): Add fwddecl.h.
+
+2015-12-18 Werner Koch <wk at gnupg.org>
+
+ build: Add required macro for pkg-config.
+ * configure.ac (PKG_PROG_PKG_CONFIG): New.
+
+2015-12-18 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Remove deprecated internal functions.
+ * g10/keygen.c (do_ask_passphrase, generate_raw_key)
+ (gen_card_key_with_backup, save_unprotected_key_to_card): Remove.
+
+ g10: Fix a regression for generating card key with backup.
+ * g10/main.h (receive_seckey_from_agent): Declare.
+ * g10/keygen.c (card_write_key_to_backup_file): New.
+ (card_store_key_with_backup): New.
+ (do_generate_keypair): Create a key on host for encryption key when
+ backup is requested. Then, call card_store_key_with_backup.
+
+2015-12-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: factor out a function for secret key retrieval.
+ * g10/export.c (receive_seckey_from_agent): New.
+ (do_export_stream): Use it.
+
+2015-12-16 Neal H. Walfield <neal at g10code.com>
+
+ gpg: When checking for ambiguous keys, ignore invalid keys.
+ * g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
+ disabled, revoked and expired keys (if appropriate for the provided
+ option).
+
+2015-12-15 Werner Koch <wk at gnupg.org>
+
+ common: Use default_errsource for call-gpg and exectool.
+ * common/call-gpg.c (my_error_from_syserror, my_error_from_errno): New.
+ Use these wrappers.
+ * common/exectool.c (my_error_from_syserror): New. Use these
+ wrappers.
+
+ gpg: Reduce number of strings to translate.
+ * g10/getkey.c (parse_def_secret_key): Do not make debug messages
+ translatable. Make use of print_reported_error.
+
+ gpg: New function to printed a detailed error code.
+ * g10/misc.c (print_reported_error): New.
+
+2015-12-15 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Improve the keyblock cache's transparency.
+ * kbx/keybox-search.c (keybox_seek): New function.
+ * g10/keydb.c (keydb_search): When reading from the cache, seek to
+ just after the cached record.
+
+ gpg: Improve the keyblock cache's transparency.
+ * kbx/keybox-search.c (keybox_offset): New function.
+ * g10/keydb.c (struct keyblock_cache): Add fields resource and offset.
+ (keyblock_cache_clear): Reset HD->KEYBLOCK_CACHE.RESOURCE and
+ HD->KEYBLOCK_CACHE.OFFSET.
+ (keydb_search): Don't use the cached result if it comes before the
+ current file position. When caching an entry, also record the
+ position at which it was found.
+
+ gpg: Use more descriptive names.
+ * g10/keyring.c (KR_NAME): Rename this...
+ (KR_RESOURCE): ... to this. Update users.
+ (struct keyring_name): Rename this...
+ (struct keyring_resource): ... to this. Update users.
+ (struct off_item): Rename this...
+ (struct key_present): ... to this. Update users.
+ (OffsetHashTable): Rename this...
+ (key_present_hash_t): ... to this. Update users.
+ (kr_offtbl): Rename this...
+ (key_present_hash): ... to this. Update users.
+ (kr_offtbl_ready): Rename this...
+ (key_present_hash_ready): ... to this. Update users.
+ (KEY_PRESENT_HASH_BUCKETS): New define. Replace use of literals
+ with this.
+ (new_offset_item): Rename this...
+ (key_present_value_new): ... to this. Update users.
+ (release_offset_items): Drop dead code.
+ (new_offset_hash_table): Rename this...
+ (key_present_hash_new): ... to this. Update users.
+ (release_offset_hash_table): Drop dead code.
+ (lookup_offset_hash_table): Rename this...
+ (key_present_hash_lookup): ... to this. Update users.
+ (update_offset_hash_table): Rename this...
+ (key_present_hash_update): ... to this. Drop unused parameter off.
+ Update users.
+ (update_offset_hash_table_from_kb): Rename this...
+ (key_present_hash_update_from_kb): ... to this. Drop unused parameter
+ off. Update users.
+
+2015-12-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ sm: Handle gcry_pk_encrypt return value.
+ * sm/encrypt.c (encrypt_dek): Don't ignore failure of gcry_pk_encrypt.
+
+2015-12-14 Werner Koch <wk at gnupg.org>
+
+ common: Change license of isascii.c to all-premissive,
+ * common/isascii.c: Change.
+
+ common: Change license of some modules to LGPLv3+/GPLv2+.
+ * common/status.c: Change from GPLv3 to LGPLv3+/GPLv2+.
+ * common/status.h: Ditto.
+ * common/yesno.c: Ditto.
+ * common/common-defs.h: Ditto.
+ * common/gettime.h: Ditto.
+ * common/keyserver.h: Ditto.
+
+ common: Change license for exectool to LGPLv3+/GPLv2+.
+ * common/exectool.c, common/exectool.h: Change license.
+
+ common: Rename sh-exectool to exectool.
+ * common/sh-exectool.c: Rename to exectool.c.
+ * common/sh-exectool.h: Rename to exectool.h.
+ * common/Makefile.am (common_sources): Adjust for rename.
+ * common/exectool.c (sh_exec_tool_stream): Rename to
+ gnupg_exec-tool-stream.
+ (sh_exec_tool): Rename to gnupg_exec_tool.
+ * tools/gpgtar-create.c (gpgtar_create): Adjust for changes.
+ * tools/gpgtar-extract.c: Adjust for changes.
+ * tools/gpgtar-list.c: Adjust for changes.
+
+2015-12-14 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ gpg: Print ownertrust in TOFU+PGP trust model.
+ * g10/keyedit.c: Print ownertrust in TOFU+PGP trust model.
+
+2015-12-14 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix --default-key checks.
+ * g10/getkey.c (parse_def_secret_key): Don't just check if a secret
+ key is available for the public key, also consider subkeys. Also
+ check that the key has the signing capability, is not revoked, is not
+ expired and is not disabled. Print a warning if there was a least one
+ value passed to --default-key and all were ignored.
+
+2015-12-14 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix regression for generating RSA keys on card.
+ * scd/app-openpgp.c (do_genkey): Strip leading zeros for fingerprint
+ computation.
+
+2015-12-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Use a regular type instead of a void* for import stats.
+ * g10/import.c (struct stats_s): Rename to import_stats_s. Change all
+ users.
+ * g10/main.h (import_stats_t): New. Change fucntions to use this
+ instead of a void pointer.
+
+ Remove replacements for libgpg-error < 1.21.
+ * common/util.h: Remove replacement macros for libgpg-error<1.21.
+ * common/types.h: Ditto.
+ * common/mischelp.h: Ditto.
+ * common/t-mapstrings.c: Include t-support.h before stringhelp.h
+ * common/t-stringhelp.c: Ditto.
+ * common/t-support.h: Always include gpg-error.h.
+ * kbx/keybox-search.c: Do not include stringhelp.h so that keybox-defs
+ comes first.
+
+2015-12-11 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix buffer overflow.
+ * g10/keydb.c (keydb_search_desc_dump): Fix buffer overflow.
+
+2015-12-11 Justus Winter <justus at g10code.com>
+
+ agent: Improve error handling.
+ * agent/pksign.c (agent_pksign_do): Improve error handling.
+
+ Fix required libgpg-error version.
+ * configure.ac (NEED_GPG_ERROR_VERSION): We need version 1.21 for the
+ poll interface.
+
+2015-12-11 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Don't error out if a key occurs multiple times in the keyring.
+ * g10/gpg.c (check_user_ids): Don't error out if a key occurs multiple
+ times in the keyring. Instead, print a warning. When printing out
+ fingerprint prints, use format_hexfingerprint to format them.
+
+2015-12-10 Daniel Hoffend <dh at dotlan.net>
+
+ scd: Fix removal of unplugged usb readers on Windows.
+ * scd/apdu.c (pcsc_error_to_sw): map PCSC_E_NO_SERVICE and
+ PCSC_E_SERVICE_STOPPED to the internal SW_HOST_NO_READER error code.
+
+2015-12-07 Justus Winter <justus at g10code.com>
+
+ tests: Add some more gpgtar tests.
+ * tests/openpgp/gpgtar.test: Add more tests.
+
+ dirmngr: Initialize http status code.
+ * dirmngr/ks-action.c (ks_action_search): Initialize 'http_status' as
+ it is unused if LDAP is used to search for keys.
+
+2015-12-04 Daiki Ueno <ueno at gnu.org>
+
+ gpg: Write ERROR status on delete-key cancellation.
+ * g10/delkey.c (do_delete_key): Write ERROR status code with the error
+ location "delete_key.secret", when the user cancelled the operation on
+ Pinentry.
+
+2015-12-04 Justus Winter <justus at g10code.com>
+
+ dirmngr: Stricter handling of http error codes.
+ * dirmngr/ks-action.c (ks_action_search): Only retry if the keyserver
+ responded with a '404 Not Found'.
+ * dirmngr/ks-engine-hkp.c (send_request): Return http status code.
+ (ks_hkp_search): Likewise.
+ (ks_hkp_{get,put}): Adapt call to 'send_request'.
+ * dirmngr/ks-engine.h (ks_hkp_search): Update prototype.
+
+ dirmngr: Really search all keyservers for patterns.
+ * dirmngr/ks-action.c (ks_action_search): Search all configured
+ keyservers for the given patterns.
+
+ GnuPG-bug-id: 1038
+
+ dirmngr: Handle http status '501 Not Implemented'.
+ * dirmngr/ks-engine-hkp.c (send_request): Handle status 501 and return
+ GPG_ERR_NOT_IMPLEMENTED.
+
+ GnuPG-bug-id: 1221
+
+ tools/gpgtar: Implement symmetric encryption.
+ * tests/openpgp/gpgtar.test: Add test case.
+ * tools/gpgtar-create.c (gpgtar_create): Pass '--symmetric' flag to
+ gpg.
+ * tools/gpgtar.c (parse_arguments): We do handle the argument now.
+
+ tools/gpgtar: Implement signing.
+ * tests/openpgp/gpgtar.test: Test signing.
+ * tools/gpgtar-create.c (gpgtar_create): Add 'sign' option, add the
+ appropriate gpg arguments to implement signing and selecting the local
+ user.
+ * tools/gpgtar.c (parse_options): We do handle '--local-user' now.
+ (main): Handle signing, encrypting, and doing both when creating an
+ archive.
+ * tools/gpgtar.h (gpgtar_create): Update prototype.
+
+ tools/gpgtar: Use the new exectool helper.
+ * tools/Makefile.am: gpgtar now requires neither npth nor libassuan.
+ * tools/gpgtar-create.c (gpgtar_create): Use the new 'sh-exectool'
+ helper.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (main): Set default gpg program. Drop the
+ initialization of npth and libassuan.
+
+ common: Add a stream interface to 'sh-exectool'.
+ * common/sh-exectool.c (struct copy_buffer): Add infrastructure for
+ copying between streams.
+ (copy_buffer_{init,shred,do_copy,flush}): New functions.
+ (sh_exec_tool_stream): Rework 'sh_exec_tool' to operate on streams.
+ (nop_free): New function.
+ (sh_exec_tool): Express this in terms of 'sh_exec_tool_stream'.
+ * common/sh-exectool.h (sh_exec_tool_stream): New prototype.
+
+ common: Add header file and build the new code.
+ * common/Makefile.am (common_sources): Add new files.
+ * common/sh-exectool.h: New file.
+
+2015-12-04 Werner Koch <wk at gnupg.org>
+
+ common: Add code to execute a helper.
+ * common/sh-exectool.c: New file.
+
+ Release 2.1.10.
+
+2015-12-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Japanese translation.
+
+2015-12-04 Werner Koch <wk at gnupg.org>
+
+ speedo,w32: Improve installer.
+ * build-aux/speedo/w32/inst.nsi (SEC_gnupg): Install dirmngr.conf and
+ distsigkey.gpg.
+ (un.gnupglast): Stop dirmngr.
+
+ gpg: Do not pre-check keys given on the command line.
+ * g10/keydb.h (PK_LIST_ENCRYPT_TO, PK_LIST_HIDDEN, PK_LIST_CONFIG)
+ (PK_LIST_SHIFT): New.
+ * g10/pkclist.c (build_pk_list): Use them here.
+ * g10/gpg.c (check_user_ids, main): Ditto.
+
+ * g10/gpg.c (main): Set PK_LIST_CONFIG for REMUSR and LOCUSR.
+ (check_user_ids): Skip check for command line specified options.
+
+ dirmngr: Add command to print the resolver version.
+ * dirmngr/server.c (cmd_getinfo): Add sub-command "dnsinfo".
+
+ gpg: Allow "help" as value for --tofu-policy.
+ * g10/gpg.c (parse_tofu_policy): Add keyword "help".
+ (parse_tofu_db_format): Ditto.
+
+ Do not translate messages printed with log_debug.
+ * common/asshelp.c (start_new_gpg_agent): Do not i18n string.
+ (start_new_dirmngr): Ditto.
+ * g10/mainproc.c (proc_encrypted): Ditto. Print only if debug is
+ enabled.
+
+2015-12-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix for removing the prefix.
+ * scd/app-openopg.c (do_decipher): Fix the condition.
+
+ scd: Simplify saving application context.
+ * scd/app.c (lock_table): Remove LAST_APP field.
+ (lock_reader, app_dump_state, application_notify_card_reset)
+ (release_application): Follow the change.
+ (check_conflict): New.
+ (check_application_conflict): Lock the slot and call check_conflict.
+ (select_application): Call check_conflict and not use LAST_APP.
+
+ scd: More fix for Curve25519 prefix handling.
+ * scd/app-openpgp.c (do_decipher): Handle trancated cipher text.
+ Also fix xfree bug introduced.
+
+2015-12-03 Werner Koch <wk at gnupg.org>
+
+ scd: Another fix for Curve25519 prefix handling.
+ * scd/app-openpgp.c (do_decipher): Check 0x02 also for 16+1 byte long
+ INDATA.
+ (do_decipher): Fix integer arithmetic in void pointer.
+ (do_decipher): Add missing memcpy.
+
+ build: Avoid dependecy problems in "make distcheck".
+ * doc/Makefile.am (gnupg.texi): Depend on defs.inc.
+
+ build: Change how caller provided CFLAGS are used by configure.
+ * configure.ac: Append instead of prepend caller provided CFLAGS.
+
+ gpg: Add variant of 'key "%s" not found: %s' error message.
+ * g10/gpg.c (check_user_ids): Change error message.
+ * g10/delkey.c (do_delete_key): Ditto.
+
+ gpg: Make keyidlist more robust in case of errors.
+ * g10/keyserver.c (keyidlist): Clear *KLIST on error.
+
+ gpg: Take care of keydb_new returning NULL.
+ * g10/keydb.c (keydb_new): Print an error message if needed. Also use
+ xtrycalloc because we return an error anyway.
+ * g10/delkey.c (do_delete_key): Handle error retruned by keydb_new.
+ * g10/export.c (do_export_stream): Ditto.
+ * g10/getkey.c (get_pubkey): Ditto.
+ (get_pubkey_fast): Ditto.
+ (get_pubkeyblock): Ditto.
+ (get_seckey): Ditto.
+ (key_byname): Ditto.
+ (get_pubkey_byfprint): Ditto.
+ (get_pubkey_byfprint_fast): Ditto.
+ (parse_def_secret_key): Ditto.
+ (have_secret_key_with_kid): Ditto.
+ * g10/import.c (import_one): Ditto.
+ (import_revoke_cert): Ditto.
+ * g10/keyedit.c (keyedit_quick_adduid): Ditto.
+ * g10/keygen.c (quick_generate_keypair): Ditto.
+ (do_generate_keypair): Ditto.
+ * g10/trustdb.c (validate_keys): Ditto.
+ * g10/keyserver.c (keyidlist): Ditto.
+ * g10/revoke.c (gen_desig_revoke): Ditto.
+ (gen_revoke): Ditto.
+ * g10/gpg.c (check_user_ids): Ditto.
+ (main): Do not print an error message for keydb_new error.
+ * g10/keylist.c (list_all): Use actual error code returned by
+ keydb_new.
+
+ * g10/t-keydb-get-keyblock.c (do_test): Abort on keydb_new error.
+ * g10/t-keydb.c (do_test): Ditto.
+
+ * g10/keyring.c (keyring_new): Actually return an error so that the
+ existing keydb_new error checking makes sense for a keyring resource.
+ (keyring_rebuild_cache): Take care of keyring_new returning an error.
+
+ gpg: Change some error messages.
+ * g10/getkey.c (parse_def_secret_key): Change error message. Replace
+ log_debug by log_info.
+ * g10/gpg.c (check_user_ids): Make function static. Change error
+ messages.
+ (main): Change error messages.
+ * g10/revoke.c (gen_revoke): Ditto.
+
+2015-12-03 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix "Conflicting usage" bug.
+ * scd/apdu.c (apdu_close_reader): Call CLOSE_READER method even if we
+ got an error from apdu_disconnect.
+ * scd/app-common.h (no_reuse): Remove.
+ * scd/app.c (application_notify_card_reset): Deallocate APP here.
+ (select_application, release_application): Don't use NO_REUSE.
+
+ scd: Fix for Curve25519 prefix handling.
+ * scd/app-openpgp.c (do_decipher): More condition for AES decipher.
+ Handle the prefix in cipher text. Always add the prefix in result.
+
+2015-12-03 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Use the matching key if the search description is exact.
+ * g10/gpg.c (check_user_ids): If the search description is for an
+ exact match (a keyid or fingerprint that ends in '!'), then use the
+ matching key, not the primary key.
+ * tests/openpgp/Makefile.am (TESTS): Add use-exact-key.test.
+ (priv_keys): Add privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc,
+ privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc,
+ privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc,
+ privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc and
+ privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc.
+ (sample_keys): Add
+ samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc.
+ * tests/openpgp/privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc:
+ New file.
+ * tests/openpgp/privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc:
+ New file.
+ * tests/openpgp/privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc:
+ New file.
+ * tests/openpgp/privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc:
+ New file.
+ * tests/openpgp/privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc:
+ New file.
+ * tests/openpgp/samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc:
+ New file.
+ * tests/openpgp/use-exact-key.test: New file.
+ * tests/openpgp/version.test: Install the new private keys.
+
+2015-12-02 Werner Koch <wk at gnupg.org>
+
+ build: Require at least Libassuan 2.4.1.
+ * configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.4.1.
+ * agent/gpg-agent.c (create_server_socket): Remove check for
+ libassuan >= 2.3.0 and >= 2.1.4.
+ (main): Remove check for libassuan >= 2.1.4.
+ * scd/scdaemon.c (create_server_socket): Remove check for
+ libassuan >= 2.1.4.
+ * dirmngr/dirmngr.c (set_tor_mode): Remove check for
+ libassuan >= 2.3.0.
+ * dirmngr/http.c (http_raw_connect, send_request): Remove checks for
+ libassuan >= 2.3.0.
+
+2015-12-02 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Improve documentation.
+ * g10/tofu.c (initdb): Improve documentation.
+
+ gpg: Fix type mismatch resulting in a buffer overflow.
+ * g10/tofu.c (record_binding): Change policy_old's type from an enum
+ tofu_policy to a long: this variable is passed by reference and a long
+ is expected.
+
+2015-12-02 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Switch to an onion address if Tor is running.
+ * dirmngr/dirmngr.h (opt): Turn field 'keyserver' into an strlist.
+ * dirmngr/dirmngr.c (parse_rereadable_options): Allow multiple
+ --keyserver options.
+ * dirmngr/server.c (server_local_s): Add field 'tor_state'.
+ (release_uri_item_list): New.
+ (release_ctrl_keyservers): Use it.
+ (start_command_handler): Release list of keyservers.
+ (is_tor_running): New.
+ (cmd_getinfo): Re-implement "tor" subcommand using new fucntion.
+ (ensure_keyserver): Rewrite.
+ * g10/dirmngr-conf.skel: Add two keyserver options.
+
+ http: Enhance parser to detect .onion addresses.
+ * dirmngr/http.h (parsed_uri_s): Add flag 'onion'.
+ * dirmngr/http.c (do_parse_uri): Set that flag.
+ * dirmngr/t-http.c (main): Print flags.
+
+2015-12-02 Neal H. Walfield <neal at g10code.com>
+
+ common,gpg: Fix processing of search descriptions ending in '!'.
+ * g10/gpg.c (check_user_ids): If the search description describes a
+ keyid or fingerprint and ends in a '!', include the '!' in the
+ rewritten description.
+ * common/userids.c (classify_user_id): Accept keyids and fingerprints
+ ending in '!'.
+
+2015-12-01 Justus Winter <justus at g10code.com>
+
+ dirmngr: Improve error handling.
+ * dirmngr/dns-stuff.c (getsrv): Avoid looking at 'header' before
+ checking for errors, but silently ignore errors when looking up SRV
+ records.
+
+2015-12-01 Werner Koch <wk at gnupg.org>
+
+ build: Let configure show the the status of Tor support.
+ * configure.ac (show_tor_support): New
+
+2015-11-30 Werner Koch <wk at gnupg.org>
+
+ doc: Make make distcheck work again.
+ * doc/Makefile.am (DISTCLEANFILES): Add gpgkey2ssh.1
+
+ yat2m: Add keyword @url.
+ * doc/yat2m.c (proc_texi_cmd): Add keyword @url.
+
+ doc: Build man pages with the same date as the info files.
+ * doc/Makefile.am (yat2m-stamp): Use option --date.
+
+ yat2m: New option --date.
+ * doc/yat2m.c (opt_date): new.
+ (isodatestring): Use it if set.
+ (main): New option --date.
+
+2015-11-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid extra translation strings.
+ * g10/keyedit.c (menu_expire): Use only one prompt.
+
+ kbx: Include gpg-error prior to mischelp.h.
+ * kbx/keybox-init.c: Change order of includes.
+
+ gpg,w32: Fix a format string error.
+ * g10/keyring.c (keyring_search): Fix format string for off_t.
+
+ Silence compiler warnings related to not using assuan_fd_t.
+ * common/call-gpg.c (start_gpg): Use assuan_fd_t. Note that the
+ declaration was already fixed by a previous change.
+ * dirmngr/server.c (cmd_getinfo): Use assuan_fd_t.
+
+ Avoid incompatible pointer assignment warnings on Windows.
+ * common/logging.c (fun_writer): Use gpgrt_ssize_t instead of ssize_t.
+ * dirmngr/server.c (data_line_cookie_write): Ditto.
+ * sm/certdump.c (format_name_writer): Ditto.
+ * sm/server.c (data_line_cookie_write): Ditto.
+ * dirmngr/http.c (cookie_read, cookie_write): Ditto.
+
+ dirmngr: Avoid a declarations after statements.
+ * tools/gpgtar.c (parse_arguments): Use a block for a local varibale
+ definition.
+
+ dirmngr: Avoid casting away a const from an char**.
+ * dirmngr/ldap.c (start_cert_fetch_ldap): Do not use pointers from
+ global variables.
+
+ dirmngr: Allow testing for a running Tor via "getinfo tor".
+ * dirmngr/server.c (cmd_getinfo): Print an S line if Tor is not
+ running.
+
+2015-11-26 Werner Koch <wk at gnupg.org>
+
+ g13: Fix commit 1a045b13.
+ * g13/g13.c (main): Use existsing function.
+
+ common: Fix off-by-one access in the new format_text.
+ * common/stringhelp.c (format_text): Use existsing fucntion to trim
+ trailing spaces. Fix off-by-one access.
+
+ dirmngr: Improve output of "getinfo tor".
+ * dirmngr/server.c (cmd_getinfo): Print a message along with OK.
+
+ dirmngr: Let Libassuan employ nPth wrappers for connect.
+ * dirmngr/http.c (my_unprotect, my_protect): Remove.
+ (connect_server): Do not use these wrappers.
+
+2015-11-26 Justus Winter <justus at g10code.com>
+
+ tools/gpgtar: Add '--dry-run'.
+ * tools/gpgtar-extract.c (extract_{regular,directory}): Honor
+ '--dry-run'.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New value.
+ (opts): Add '--dry-run'.
+ (parse_arguments): Handle '--dry-run'.
+ * tools/gpgtar.h (opt): Add field 'dry_run'.
+
+ tools/gpgtar: Handle '--gpg-args'.
+ * tools/gpgtar-create.c (gpgtar_create): Use given arguments.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New value.
+ (opts): Add 'gpg-args'.
+ (parse_arguments): Handle arguments.
+ * tools/gpgtar.h (opt): Add field 'gpg_arguments'.
+ * tests/openpgp/gpgtar.test: Simplify accordingly.
+
+ common: Make the GPG arguments configurable in call-gpg.
+ * common/call-gpg.c (start_gpg): Add parameter 'gpg_arguments'.
+ (_gpg_encrypt, gpg_encrypt_blob, gpg_encrypt_stream): Likewise.
+ (_gpg_decrypt, gpg_decrypt_blob, gpg_decrypt_stream): Likewise.
+ * common/call-gpg.h: Adapt prototypes.
+ * g13/create.c (encrypt_keyblob): Adapt callsite.
+ * g13/g13-common.h (opt): Add field 'gpg_arguments'.
+ * g13/g13.c (main): Construct default arguments.
+ * g13/mount.c (decrypt_keyblob): Adapt callsite.
+ * tools/gpgtar-create.c (gpgtar_create): Likewise.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+
+ tools/gpgtar: Handle '--tar-args' for compatibility with gpg-zip.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New value.
+ (opts): Add new group for tar options, rearrange a little, add
+ '--tar-args'.
+ (tar_opts): New variable.
+ (shell_parse_stringlist): New function.
+ (shell_parse_argv): Likewise.
+ (parse_arguments): Add option argument, handle '--tar-args'.
+ (main): Fix invokation of 'parse_arguments'.
+ * tests/openpgp/gpgtar.test: Simplify decryption.
+
+ tools/gpgtar: Rework argument parsing.
+ * tools/gpgtar.c (main): Move argument parsing into its own function.
+
+2015-11-25 Justus Winter <justus at g10code.com>
+
+ tests: Add tests for gpgtar and gpg-zip.
+ * tests/openpgp/Makefile.am (TESTS): Add new file.
+ * tests/openpgp/gpgtar.test: New file.
+
+ tools/gpgtar: Handle '--directory' argument.
+ * tools/gpgtar-extract.c (gpgtar_extract): Only generate a directory
+ name if none is given via arguments.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New constant.
+ (opts): Add argument.
+ (main): Parse argument.
+ * tools/gpgtar.h (opt): New field 'directory'.
+
+ tools/gpgtar: Handle '--gpg' argument.
+ * tools/gpgtar-create.c (gpgtar_create): Use given gpg program.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New constant.
+ (opts): Add argument.
+ (main): Handle argument.
+ * tools/gpgtar.h (opt): Add field 'gpg_program'.
+
+ tools/gpgtar: Improve error handling.
+ * tools/gpgtar-create.c (gpgtar_create): Return an error code, fix
+ error handling.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (read_header): Return an error code.
+ (gpgtar_list): Return an error code, fix error handling.
+ (gpgtar_read_header): Return an error code.
+ * tools/gpgtar.c: Add missing include.
+ (main): Print an generic error message if a command failed and no
+ error has been printed yet.
+ * tools/gpgtar.h (gpgtar_{create,extract,list,read_header}): Fix the
+ prototypes accordingly.
+
+ tools: Add encryption and decryption support to gpgtar.
+ * tools/Makefile.am: Amend CFLAGS and LDADD.
+ * tools/gpgtar-create.c (gpgtar_create): Add encrypt flag and encrypt
+ stream if requested.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise for decryption.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (main): Initialize npth and assuan. Parse recipient
+ and local user, and note which flags are currently ignored. Adapt
+ calls to gpgtar_list and friends.
+ (tar_and_encrypt): Drop stub function and prototype.
+ (decrypt_and_untar): Likewise.
+ (decrypt_and_list): Likewise.
+ * tools/gpgtar.h (gpgtar_{create,extract,list}): Add encryption or
+ decryption argument.
+
+ common: Add stream interface to call-pgp.
+ * common/call-gpg.c (struct writer_thread_parms): Add field 'stream'.
+ (writer_thread_main): Support reading from a stream.
+ (start_writer): Add stream argument.
+ (struct reader_thread_parms): Add field 'stream'.
+ (reader_thread_main): Support writing to a stream.
+ (start_reader): Add stream argument.
+ (_gpg_encrypt): Add stream api.
+ (gpg_encrypt_blob): Adapt accordingly.
+ (gpg_encrypt_stream): New function.
+ (_gpg_decrypt): Add stream api.
+ (gpg_decrypt_blob): Adapt accordingly.
+ (gpg_decrypt_stream): New function.
+ * common/call-gpg.h (gpg_encrypt_stream): New prototype.
+ (gpg_decrypt_stream): Likewise.
+
+ common: Refactor the call-gpg code.
+ * common/call-gpg.c (gpg_{en,de}crypt_blob): Move most of the code
+ into two new functions, _gpg_encrypt and _gpg_decrypt.
+
+ g13: Move 'call-gpg.c' to common.
+ * common/Makefile.am (common_sources): Add files.
+ * g13/call-gpg.c: Move to 'common' and adapt slightly. Add a
+ parameter to let callees override the gpg program to execute.
+ * g13/call-gpg.h: Likewise.
+ * g13/Makefile.am (g13_SOURCES): Drop files.
+ * g13/create.c (encrypt_keyblob): Hand in the gpg program to execute.
+ * g13/mount.c (decrypt_keyblob): Likewise.
+
+2015-11-24 Neal H. Walfield <neal at g10code.com>
+
+ gpg: When comparing keyids, use the keyid, not the fingerprint's suffix.
+ * g10/keyedit.c (menu_select_key): Use spacep and hexdigitp instead of
+ inline tests. Don't compare P to the suffix of the fingerprint. If P
+ appears to be a keyid, do an exact compare against the keyid. If it
+ appears to be a fingerprint, do an exact compare against the
+ fingerprint.
+
+2015-11-23 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Reflow long texts.
+ * common/stringhelp.c (format_text): New function.
+ * common/t-stringhelp.c (stresc): New function.
+ (test_format_text): New function. Test format_text.
+ * g10/tofu.c (get_trust): Use format_text to reflow long texts.
+ (show_statistics): Likewise.
+
+ common: Extend utf8_charcount to include the string's length.
+ * common/stringhelp.c (utf8_charcount): Take additional parameter,
+ len. Process at most LEN bytes.
+
+2015-11-23 Justus Winter <justus at g10code.com>
+
+ dirmngr: Fix http lookups when libadns is used.
+ * dirmngr/dns-stuff.c (resolve_name_adns): Fill in the port.
+
+ dirmngr: Fix SRV record lookups when using the system resolver.
+ * dirmngr/dns-stuff.c (getsrv): Fix error handling.
+
+ dirmngr: Honor ports specified in SRV records.
+ * dirmngr/ks-engine-hkp.c (struct hostinfo_s): New field 'port'.
+ (create_new_hostinfo): Initialize 'port'.
+ (add_host): Add host parameter and update the hosttable entry.
+ (map_host): Return port if known, adjust calls to 'add_host'.
+ (make_host_part): Let 'map_host' specify the port if known.
+
+ dirmngr: Support hkp server pools using SRV records.
+ * dirmngr/ks-engine-hkp.c (map_host): Handle SRV records.
+
+ dirmngr: Refactor 'map_host'.
+ * dirmngr/ks-engine-hkp.c (add_host): New function.
+ (map_host): Use the new function.
+
+ dirmngr: Fix pool detection.
+ * dirmngr/ks-engine-hkp (arecords_is_pool): Fix counting IP addresses.
+
+ dirmngr: Refactor 'map_host'.
+ * dirmngr/ks-engine-hkp.c (arecords_is_pool): New function.
+ (map_host): Use the new function.
+
+ dirmngr: Start dirmngr on demand.
+ * common/asshelp.h: Include 'util.h'.
+ * dirmngr/dirmngr-client.c (main): Use 'start_new_dirmngr' to connect
+ to the dirmngr.
+ (start_dirmngr): Drop now unused declaration and function.
+
+2015-11-23 Neal H. Walfield <neal at g10code.com>
+
+ gpg: If sqlite is not available, don't build things depending on it.
+ * configure.ac: Define the automake conditional SQLITE3.
+ * tests/openpgp/Makefile.am (TESTS): Move the sqlite3 dependent tests
+ to...
+ (sqlite3_dependent_tests): ... this new variable. If SQLITE3 is not
+ defined, then clear this variable.
+
+ gpg: Allow updating the expiration time of multiple subkeys at once.
+ * g10/keyedit.c (menu_expire): Allow updating the expiration time of
+ multiple subkeys at once.
+
+ gpg: Don't crash if key is not passed an argument.
+ * g10/keyedit.c (menu_select_key): Don't crash if P is NULL.
+
+2015-11-20 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fail if the search description passed to --gen-revoke is ambiguous.
+ * g10/revoke.c (gen_revoke): Error out if the search description is
+ ambiguous.
+
+ gpg: Refactor print_seckey_info.
+ * g10/keylist.c (print_seckey_info): Break formatting functionality
+ into...
+ (format_seckey_info): ... this new function.
+
+ gpg: Improve an error message.
+ * g10/revoke.c (gen_revoke): Provide a more descriptive error message
+ if searching for a key fails.
+
+2015-11-19 Justus Winter <justus at g10code.com>
+
+ dirmngr: Improve error handling.
+ * dirmngr/crlcache.c (crl_cache_cert_isvalid): Add missing break.
+
+ dirmngr: Fix memory leak.
+ * dirmngr/ldap.c (start_cert_fetch_ldap): Avoid leaking all malloc'ed
+ arguments.
+
+ agent: Improve error handling.
+ * agent/trustlist.c (istrusted_internal): Initialize 'err'.
+
+ common: Avoid undefined behavior.
+ * common/iobuf.c (iobuf_esopen): Initialize 'len' as 'file_es_filter'
+ will make use of it.
+
+ g10: Avoid undefined behavior.
+ * g10/trust.c (clean_one_uid): Avoid a computation involving an
+ uninitialized value.
+
+ scd: Improve error handling.
+ * scd/app-openpgp.c (get_public_key): Improve error handling.
+
+2015-11-18 Justus Winter <justus at g10code.com>
+
+ dirmngr: Gracefully handle premature termination of TLS streams.
+ * dirmngr/http.c (close_tls_session): New function.
+ (session_unref): Use the new function to close the TLS stream.
+ (cookie_read): If the stream terminated prematurely, close it and
+ return a short read.
+
+2015-11-17 Neal H. Walfield <neal at g10code.com>
+ Michael Mönch <michael.moench at marktjagd.de>
+
+ tools: Fix option parsing for gpg-zip.
+ * tools/gpg-zip.in: Correctly set GPG when --gpg is specified.
+ Correctly set TAR when --tar is specified. Pass TAR_ARGS to tar.
+
+2015-11-17 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Allow selecting subkeys using a keyid.
+ * g10/keyedit.c (menu_select_key): Take an additional argument, p.
+ Update callers. If P is a hex string, then assume that P is a key id
+ or fingerprint and select subkeys with matching key ids or
+ fingerprints.
+ * doc/gpg.texi: Update documentation for the key subcommand.
+
+2015-11-17 Justus Winter <justus at g10code.com>
+
+ dirmngr: Fix specifying keyservers by IP address.
+ * dirmngr/ks-engine-hkp.c (map_host): Update the original 'hosttable'
+ entry instead of creating another one.
+
+2015-11-17 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Change keydb_search to not return legacy keys.
+ * g10/keyring.c (keyring_search): Take new argument, ignore_legacy.
+ If set, skip any legacy keys. Update callers.
+ * g10/keydb.c (keydb_search): Skip any legacy keys.
+ (keydb_search_first): Don't skip legacy keys. Treat them
+ as an error.
+ (keydb_search_next): Likewise.
+ (keydb_search_fpr): Likewise.
+ * g10/export.c (do_export_stream): Likewise.
+ * g10/getkey.c (lookup): Likewise.
+ (have_secret_key_with_kid): Likewise.
+ * g10/keylist.c (list_all): Likewise.
+ (keyring_rebuild_cache): Likewise.
+ * g10/keyserver.c (keyidlist): Likewise.
+ * g10/trustdb.c (validate_key_list): Likewise.
+
+ gpg: Correctly handle an error.
+ * g10/keyring.c (keyring_search): If a compare function returns an
+ error, treat it as an error.
+
+ gpg: Correctly handle keyblocks followed by legacy keys.
+ * g10/keyring.c (keyring_get_keyblock): If we encounter a legacy
+ packet after already having some non-legacy packets, then treat the
+ legacy packet as a keyblock boundary, not as part of the keyblock.
+ * g10/t-keydb-get-keyblock.c: New file.
+ * g10/t-keydb-get-keyblock.gpg: New file.
+ * g10/Makefile.am (EXTRA_DIST): Add t-keydb-get-keyblock.gpg.
+ (module_tests): Add t-keydb-get-keyblock.
+ (t_keydb_get_keyblock_SOURCES): New variable.
+ (t_keydb_get_keyblock_LDADD): Likewise.
+
+ gpg: Make debugging search descriptors easier.
+ * g10/keydb.c (dump_search_desc): Rename from this...
+ (keydb_search_desc_dump): ... to this. Only process a single search
+ descriptor. Improve output. Don't mark as static. Update callers.
+
+ gpg: Add function format_keyid.
+ * g10/options.h (opt.keyid_format): Add new value KF_DEFAULT.
+ * g10/keyid.c (format_keyid): New function.
+ (keystr): Use it.
+
+ gpg: Use a more appropriate error code.
+ * g10/gpg.c (check_user_ids): Return a more appropriate error code if
+ a user id is ambiguous.
+
+2015-11-17 Justus Winter <justus at g10code.com>
+
+ Fix typos found using codespell.
+ * agent/cache.c: Fix typos.
+ * agent/call-pinentry.c: Likewise.
+ * agent/call-scd.c: Likewise.
+ * agent/command-ssh.c: Likewise.
+ * agent/command.c: Likewise.
+ * agent/divert-scd.c: Likewise.
+ * agent/findkey.c: Likewise.
+ * agent/gpg-agent.c: Likewise.
+ * agent/w32main.c: Likewise.
+ * common/argparse.c: Likewise.
+ * common/audit.c: Likewise.
+ * common/audit.h: Likewise.
+ * common/convert.c: Likewise.
+ * common/dotlock.c: Likewise.
+ * common/exechelp-posix.c: Likewise.
+ * common/exechelp-w32.c: Likewise.
+ * common/exechelp-w32ce.c: Likewise.
+ * common/exechelp.h: Likewise.
+ * common/helpfile.c: Likewise.
+ * common/i18n.h: Likewise.
+ * common/iobuf.c: Likewise.
+ * common/iobuf.h: Likewise.
+ * common/localename.c: Likewise.
+ * common/logging.c: Likewise.
+ * common/openpgp-oid.c: Likewise.
+ * common/session-env.c: Likewise.
+ * common/sexputil.c: Likewise.
+ * common/sysutils.c: Likewise.
+ * common/t-sexputil.c: Likewise.
+ * common/ttyio.c: Likewise.
+ * common/util.h: Likewise.
+ * dirmngr/cdblib.c: Likewise.
+ * dirmngr/certcache.c: Likewise.
+ * dirmngr/crlcache.c: Likewise.
+ * dirmngr/dirmngr-client.c: Likewise.
+ * dirmngr/dirmngr.c: Likewise.
+ * dirmngr/dirmngr_ldap.c: Likewise.
+ * dirmngr/dns-stuff.c: Likewise.
+ * dirmngr/http.c: Likewise.
+ * dirmngr/ks-engine-hkp.c: Likewise.
+ * dirmngr/ks-engine-ldap.c: Likewise.
+ * dirmngr/ldap-wrapper.c: Likewise.
+ * dirmngr/ldap.c: Likewise.
+ * dirmngr/misc.c: Likewise.
+ * dirmngr/ocsp.c: Likewise.
+ * dirmngr/validate.c: Likewise.
+ * g10/encrypt.c: Likewise.
+ * g10/getkey.c: Likewise.
+ * g10/gpg.c: Likewise.
+ * g10/gpgv.c: Likewise.
+ * g10/import.c: Likewise.
+ * g10/keydb.c: Likewise.
+ * g10/keydb.h: Likewise.
+ * g10/keygen.c: Likewise.
+ * g10/keyid.c: Likewise.
+ * g10/keylist.c: Likewise.
+ * g10/keyring.c: Likewise.
+ * g10/mainproc.c: Likewise.
+ * g10/misc.c: Likewise.
+ * g10/options.h: Likewise.
+ * g10/packet.h: Likewise.
+ * g10/parse-packet.c: Likewise.
+ * g10/pkclist.c: Likewise.
+ * g10/pkglue.c: Likewise.
+ * g10/plaintext.c: Likewise.
+ * g10/server.c: Likewise.
+ * g10/sig-check.c: Likewise.
+ * g10/sqlite.c: Likewise.
+ * g10/tdbio.c: Likewise.
+ * g10/test-stubs.c: Likewise.
+ * g10/tofu.c: Likewise.
+ * g10/trust.c: Likewise.
+ * g10/trustdb.c: Likewise.
+ * g13/create.c: Likewise.
+ * g13/mountinfo.c: Likewise.
+ * kbx/keybox-blob.c: Likewise.
+ * kbx/keybox-file.c: Likewise.
+ * kbx/keybox-init.c: Likewise.
+ * kbx/keybox-search-desc.h: Likewise.
+ * kbx/keybox-search.c: Likewise.
+ * kbx/keybox-update.c: Likewise.
+ * scd/apdu.c: Likewise.
+ * scd/app-openpgp.c: Likewise.
+ * scd/app-p15.c: Likewise.
+ * scd/app.c: Likewise.
+ * scd/ccid-driver.c: Likewise.
+ * scd/command.c: Likewise.
+ * scd/iso7816.c: Likewise.
+ * sm/base64.c: Likewise.
+ * sm/call-agent.c: Likewise.
+ * sm/call-dirmngr.c: Likewise.
+ * sm/certchain.c: Likewise.
+ * sm/gpgsm.c: Likewise.
+ * sm/import.c: Likewise.
+ * sm/keydb.c: Likewise.
+ * sm/minip12.c: Likewise.
+ * sm/qualified.c: Likewise.
+ * sm/server.c: Likewise.
+ * tools/gpg-check-pattern.c: Likewise.
+ * tools/gpgconf-comp.c: Likewise.
+ * tools/gpgkey2ssh.c: Likewise.
+ * tools/gpgparsemail.c: Likewise.
+ * tools/gpgtar.c: Likewise.
+ * tools/rfc822parse.c: Likewise.
+ * tools/symcryptrun.c: Likewise.
+
+2015-11-16 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix error checking and improve error reporting.
+ * g10/gpg.c (check_user_ids): Differentiate between a second result
+ and an error. If the key specification is ambiguous or an error
+ occurs, set RC appropriately.
+
+2015-11-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Use only one fingerprint formatting function.
+ * g10/gpg.h (MAX_FORMATTED_FINGERPRINT_LEN): New.
+ * g10/keyid.c (hexfingerprint): Add optional args BUFFER and BUFLEN.
+ Change all callers.
+ (format_hexfingerprint): New.
+ * g10/keylist.c (print_fingerprint): Change to use hexfingerprint.
+ * g10/tofu.c (fingerprint_format): Remove. Replace calls by
+ format_hexfingerprint.
+
+2015-11-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Simplify the tofu interface by using the public key packet.
+ * g10/tofu.c (fingerprint_str): Remove.
+ (tofu_register): Take a public key instead of a fingerprint as arg.
+ Use hexfingerprint() to get a fpr from the PK.
+ (tofu_get_validity): Ditto.
+ (tofu_set_policy, tofu_get_policy): Simplify by using hexfingerprint.
+ * g10/trustdb.c (tdb_get_validity_core): Pass the primary key PK to
+ instead of the fingerprint to the tofu functions.
+
+ gpg: Make trusted-key override for Tofu robust against swapped tofu.db.
+ * g10/tofu.c (get_trust): For the UTK check lookup the key by
+ fingerprint.
+
+ gpg: Fix regression in --locate-keys (in 2.1.9).
+ * g10/getkey.c (getkey_ctx_s): Add field "extra_list".
+ (get_pubkey_byname): Store strings in the context.
+ (getkey_end): Free EXTRA_LIST.
+
+2015-11-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Print a new EXPORTED status line.
+ * common/status.h (STATUS_EXPORTED): New.
+ * g10/export.c (print_status_exported): New.
+ (do_export_stream): Call that function.
+
+ gpg: Print export statistics to the status-fd.
+ * common/status.h (STATUS_EXPORT_RES): New.
+ * g10/main.h (export_stats_t): New.
+ * g10/export.c (export_stats_s): New.
+ (export_new_stats, export_release_stats): New.
+ (export_print_stats): New.
+ (export_pubkeys, export_seckeys, export_secsubkeys)
+ (export_pubkey_buffer, do_export): Add arg "stats".
+ (do_export_stream): Add arg stats and update it.
+ * g10/gpg.c (main) <aExport, aExportSecret, aExportSecretSub>: Create,
+ pass, and print a stats object to the export function calls.
+
+ * g10/export.c (export_pubkeys_stream): Remove unused function.
+
+ dirmngr: Do not block during ADNS calls.
+ * dirmngr/dns-stuff.c: Include npth.h
+ (my_unprotect, my_protect): New wrapper.
+ (resolve_name_adns): Put unprotect/protect around adns calls.
+ (get_dns_cert): Ditto.
+ (getsrv): Ditto.
+ (get_dns_cname): Ditto.
+
+ dirmngr: New option --nameserver.
+ * dirmngr/dirmngr.c (oNameServer): New.
+ (opts): Add --nameserver.
+ (parse_rereadable_options): Act upon oNameServer.
+ * dirmngr/dns-stuff.c (DEFAULT_NAMESERVER): New.
+ (tor_nameserver): New.
+ (set_dns_nameserver): New.
+ (my_adns_init): Make name server configurable.
+
+2015-11-11 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix cache consistency problem.
+ g10/keyring.c (keyring_search): Only mark the cache as completely
+ filled if we start the scan from the beginning of the keyring.
+
+2015-11-10 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Default to the the PGP trust model.
+ * g10/trustdb.c (init_trustdb): If we can't read the trust model from
+ the trust DB, default to TM_PGP, not TM_TOFU_PGP.
+
+ gpg: Default to the flat TOFU DB format.
+ * g10/tofu.c (opendbs): If the TOFU DB format is set to auto and there
+ is no TOFU DB, default to the flat format.
+
+2015-11-09 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Change to new ADNS Tor mode init scheme.
+ * dirmngr/dns-stuff.c (tor_credentials): New.
+ (enable_dns_tormode): Add arg new_circuit and update tor_credentials.
+ (my_adns_init): Rework to set Tor mode using a config file options and
+ always use credentials.
+ * dirmngr/server.c (cmd_dns_cert): Improve error message.
+ * dirmngr/t-dns-stuff.c (main): Add option --new-circuit.
+
+ dirmngr: Improve detection of ADNS.
+ * configure.ac (HAVE_ADNS_FREE): New ac_define.
+
+2015-11-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Add reder information to --card-status.
+ * g10/call-agent.h, g10/call-agent.c (agent_release_card_info)
+ g10/card-util.c (card_status): Add READER.
+ * scd/apdu.c (close_ccid_reader, open_ccid_reader): Handle RDRNAME.
+ (apdu_get_reader_name): New.
+ * scd/ccid-driver.c (ccid_open_reader): Add argument to RDRNAME_P.
+ * scd/command.c (cmd_learn): Return READER information.
+
+2015-11-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid new strings.
+ * g10/decrypt-data.c (decrypt_data): Use already translated strings.
+
+ common: Fix commit f99830b.
+ * common/userids.c (classify_user_id): Avoid underflow. Use spacep to
+ also trim tabs.
+
+2015-11-06 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix formatting string.
+ * g10/decrypt-data.c (decrypt_data): Fix formatting string.
+
+ gpg: Add new option --only-sign-text-ids.
+ * g10/options.h (opt): Add field only_sign_text_ids.
+ * g10/gpg.c (enum cmd_and_opt_values): Add value oOnlySignTextIDs.
+ (opts): Handle oOnlySignTextIDs.
+ (main): Likewise.
+ * g10/keyedit.c (sign_uids): If OPT.ONLY_SIGN_TEXT_IDS is set, don't
+ select non-text based IDs automatically.
+ (keyedit_menu): Adapt the prompt asking to sign all user ids according
+ to OPT.ONLY_SIGN_TEXT_IDS.
+ * doc/gpg.texi: Document the new option --only-sign-text-ids.
+
+ common: When classifying keyids and fingerprints, reject trailing junk.
+ * common/userids.c (classify_user_id): Trim any trailing whitespace.
+ Before assuming that a hexstring corresponds to a key id or
+ fingerprint, make sure that it is NUL terminated.
+
+ gpg: Check for ambiguous or non-matching key specs.
+ * g10/gpg.c (check_user_ids): New function.
+ (main): Check that any user id specifications passed to --local-user
+ and --remote-user correspond to exactly 1 user. Check that any user
+ id specifications passed to --default-key correspond to at most 1
+ user. Warn if any user id specifications passed to --local-user or
+ --default-user are possible ambiguous (are not specified by long keyid
+ or fingerprint).
+ * g10/getkey.c (parse_def_secret_key): Don't warn about possible
+ ambiguous key descriptions here.
+
+ common: Add new function strlist_rev.
+ * common/strlist.c (strlist_rev): New function.
+ * common/t-strlist.c: New file.
+ * common/Makefile.am (common_sources): Add strlist.c and strlist.h.
+ (module_tests): Add t-strlist.
+ (t_strlist_LDADD): New variable.
+
+ common: Include required, but not included headers in t-support.h.
+ * common/t-support.h: Include <stdlib.h> and <stdio.h>.
+
+2015-11-05 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Indicate which characters are invalid.
+ * g10/keygen.c (ask_user_id): Indicate which characters are invalid.
+
+ gpg: Add support for unwrapping the outer level of encryption.
+ * g10/decrypt-data.c (decrypt_data): If OPT.UNWRAP_ENCRYPTION is set,
+ copy the data to the output file instead of continuing to process it.
+ * g10/gpg.c (enum cmd_and_opt_values): Add new value oUnwrap.
+ (opts): Handle oUnwrap.
+ (main): Likewise.
+ * g10/options.h (opt): Add field unwrap_encryption.
+ * g10/plaintext.c (handle_plaintext): Break the output file selection
+ functionality into ...
+ (get_output_file): ... this new function.
+
+ common: Add a function for copying data from one iobuf to another.
+ * common/iobuf.c (iobuf_copy): New function.
+
+ doc: Note that gpgkey2ssh is deprecated.
+ * doc/tools.texi (gpgkey2ssh): Note that gpgkey2ssh is deprecated.
+
+ tools: Fix gpgkey2ssh's most gratuitous errors. Use gpg2, not gpg.
+ * tools/gpgkey2ssh.c (main): Add support for --help. Replace the most
+ gratuitous asserts with error messages. Invoke gpg2, not gpg.
+
+2015-11-05 Neal H. Walfield <neal at g10code.com>
+ Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ doc: Add documentation for gpgkey2ssh.
+ * doc/tools.texi: Add documentation for gpgkey2ssh.
+
+2015-11-04 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Print a better error message for --multifile --sign --encrypt.
+ * g10/gpg.c (main): Print a better error message for --multifile
+ --sign --encrypt.
+
+ gpg: Add --encrypt-to-default-key.
+ * g10/getkey.c (parse_def_secret_key): Drop the static qualifier and
+ export the function.
+ * g10/gpg.c (enum cmd_and_opt_values): Add value oEncryptToDefaultKey.
+ (opts): Handle oEncryptToDefaultKey.
+ (main): Likewise.
+ * g10/options.h (opt): Add field encrypt_to_default_key.
+
+ gpg: Allow multiple --default-key options. Take the last available key.
+ * g10/getkey.c (parse_def_secret_key): New function.
+ (get_seckey_default): Add parameter ctrl. Update callers. Use
+ parse_def_secret_key to get the default secret key, if any.
+ (getkey_byname): Likewise.
+ (enum_secret_keys): Likewise.
+ * g10/options.h (opt): Change def_secret_key's type from a char * to a
+ strlist_t.
+ * g10/gpg.c (main): When processing --default-key, add the key to
+ OPT.DEF_SECRET_KEY.
+ * g10/gpgv.c (get_session_key): Add parameter ctrl. Update callers.
+ * g10/mainproc.c (proc_pubkey_enc): Likewise.
+ (do_proc_packets): Likewise.
+ * g10/pkclist.c (default_recipient): Likewise.
+ * g10/pubkey-enc.c (get_session_key): Likewise.
+ * g10/sign.c (clearsign_file): Likewise.
+ (sign_symencrypt_file): Likewise.
+ * g10/skclist.c (build_sk_list): Likewise.
+ * g10/test-stubs.c (get_session_key): Likewise.
+
+2015-11-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix error handling with libusb-compat library.
+ * scd/ccid-driver.c (bulk_out): Use LIBUSB_ERRNO_NO_SUCH_DEVICE.
+
+ scd: fix change_keyattr.
+ * scd/app-openpgp.c (change_keyattr_from_string): Fix parsing.
+
+2015-11-03 Werner Koch <wk at gnupg.org>
+
+ gpg: Change out of core error message.
+ * g10/tofu.c (fingerprint_str): Die with the error code returned by
+ the failed function.
+ (time_ago_str): Ditto. Do not make a comma translatable.
+ (fingerprint_format): Use "%zu" for a size_t.
+
+ gpg: Make translation easier.
+ * g10/import.c (import_secret_one): Split info string for easier
+ translation.
+
+2015-11-03 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Also show when the most recently signed message was observed.
+ * g10/tofu.c (show_statistics): Also show when the most recently
+ signed message was observed.
+
+ gpg: Split a utility function out of a large function.
+ * g10/tofu.c (show_statistics): Break the time delta to string code
+ into...
+ (time_ago_str): ... this new function.
+
+ gpg: Fix message formatting.
+ * g10/tofu.c (get_trust): Fix message formatting.
+
+ gpg: Don't store formatting fingerprints in the TOFU DB.
+ * g10/tofu.c (fingerprint_pp): Split this function into...
+ (fingerprint_str): ... this function...
+ (fingerprint_format): ... and this function.
+ (record_binding): Store the unformatted fingerprint in the DB. Only
+ use the formatting fingerprint when displaying a message to the user.
+ (get_trust): Likewise.
+ (show_statistics): Likewise.
+ (tofu_register): Likewise.
+ (tofu_get_validity): Likewise.
+ (tofu_set_policy): Likewise.
+ (tofu_get_policy): Likewise.
+
+2015-11-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: notify a user when importing stub is skipped.
+ * g10/import.c (transfer_secret_keys): Return GPG_ERR_NOT_PROCESSED
+ when stub_key_skipped.
+ (import_secret_one): Notify a user, suggesting --card-status.
+
+2015-10-31 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Consider newlines to be whitespace in an SQL statement.
+ * g10/sqlite.c (sqlite3_stepx): When making sure that there is no
+ second SQL statement, ignore newlines.
+
+2015-10-30 Werner Koch <wk at gnupg.org>
+
+ common: Improve t-zb32 to be used for manual encoding.
+ * common/t-support.h (no_exit_on_fail, errcount): New.
+ (fail): Bump errcount.
+ * common/t-zb32.c (main): Add options to allow manual use.
+
+ common: Add separate header for zb32.c.
+ * common/util.h (zb32_encode): Move prototype to ...
+ * common/zb32.h: new. Include this for all callers of zb32_encode.
+
+2015-10-29 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Display the correct error message.
+ * g10/trustdb.c (validate_keys): If tdbio_update_version_record fails,
+ RC does not contain the error code. Save the error code in rc2 and
+ use that.
+
+ gpg: Eliminate a memory leak.
+ * g10/trustdb.c (validate_key_list): Don't leak the keyblocks on
+ failure.
+
+ gpg: Remove unused prototype.
+ g10/keyring.h (keyring_locate_writable): Remove unused prototype.
+
+ gpg: Eliminate a memory leak.
+ * g10/gpg.c (main): Don't leak OPT.DEF_RECIPIENT.
+
+ gpg: Fix keyring support.
+ * g10/keydb.c (keydb_rebuild_caches): Only mark the cached as prepared
+ if it is actually prepared, which it only is if the resource is a
+ keybox.
+
+ gpg: Change sqlite3_stepx to pass the sqlite3_stmt * to the callback.
+ * g10/sqlite.h (enum sqlite_arg_type): Add SQLITE_ARG_BLOB.
+ (sqlite3_stepx_callback): New declaration.
+ (sqlite3_stepx): Change the callback's type to sqlite3_stepx_callback,
+ which passes an additional parameter, the sqlite3_stmt *. Update
+ users.
+
+ gpg: Move sqlite helper functions into their own file.
+ * g10/tofu.c (sqlite3_exec_printf): Move from here...
+ * g10/sqlite.c (sqlite3_exec_printf): ... to this new file. Don't
+ mark as static.
+ * g10/tofu.c (sqlite3_stepx): Move from here...
+ * g10/sqlite.c (sqlite3_stepx): ... to this new file. Don't
+ mark as static.
+ * g10/tofu.c (enum sqlite_arg_type): Move from here...
+ * g10/sqlite.h (enum sqlite_arg_type): ... to this new file.
+
+2015-10-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ doc: Don't install gpg-zip.1.
+ * doc/Makefile.am (myman_pages): Remove gpg-zip.1.
+ (DISTCLEANFILES): Add gpg-zip.1.
+
+2015-10-28 Werner Koch <wk at gnupg.org>
+
+ sm: Allow combination of usage flags --gen-key.
+ * sm/certreqgen.c (create_request): Re-implement building of the
+ key-usage extension.
+
+2015-10-28 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ doc: Document some changed default options.
+ * doc/gpg.texi: Update the description of some options which are
+ now enabled by default.
+
+2015-10-28 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix NULL-deref while loading a CRL.
+ * dirmngr/crlcache.c (crl_parse_insert): Set error before leaping to
+ failure.
+
+ dirmngr: Minor cleanup of the SRV RR code.
+ * dirmngr/dns-stuff.c: Include unistd.h.
+ (getsrv): Run srand only once.
+ * dirmngr/t-dns-stuff.c (main): Allow passing another name for --srv
+ and change output format.
+
+ dirmngr: Add a getaddrinfo wrapper backend using ADNS.
+ * dirmngr/dns-stuff.c: Replace all use of default_errsource.
+ (my_adns_init): Move to top.
+ (resolve_name_adns): New.
+ (resolve_dns_name) [USE_ADNS]: Divert to new func.
+
+2015-10-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not call an extra get_validity if no-show-uid-validity is used.
+ * g10/mainproc.c (check_sig_and_print): Do not call the informational
+ get_validity if we are not going to use it.
+
+2015-10-26 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Ensure all weak digest rejection notices are shown.
+ * g10/main.h: Add rejection_shown flag to each weakhash struct
+ * g10/misc.c (print_digest_algo_note, additional_weak_digest): Do not
+ treat MD5 separately; (print_digest_rejected_note): Use
+ weakhash.rejection_shown instead of static shown.
+ * g10/options.h (opt): Change from additional_weak_digests to
+ weak_digests.
+ * g10/sig-check.c: Do not treat MD5 separately.
+ * g10/gpg.c (main): Explicitly set MD5 as weak.
+ * g10/gpgv.c (main): Explicitly set MD5 as weak.
+
+2015-10-26 Werner Koch <wk at gnupg.org>
+
+ w32: Make it build again if Tofu support is not available.
+ * g10/keylist.c (public_key_list) [!USE_TOFU]: Do not call tofu
+ functions.
+
+ dirmngr: Support Tor hidden services.
+ * dirmngr/dns-stuff.c (is_onion_address): New.
+ * dirmngr/ks-engine-hkp.c (hostinfo_s): Add field "onion".
+ (map_host): Special case onion addresses.
+ (ks_hkp_print_hosttable): Print an 'O' for an onion address.
+ * dirmngr/http.c (connect_server): Special case onion addresses.
+
+ dirmngr,w32: Remove gethostbyname hack and make it build again.
+ * dirmngr/http.c (connect_server) [W32]: Remove gethostbyname hack;
+ we require getaddrinfo anyway.
+ * dirmngr/dns-stuff.c (AI_ADDRCONFIG): Add replacement if not defined.
+ (map_eai_to_gpg_error) [W32]: Take care of unsupported codes.
+
+2015-10-26 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Make sure we only have a single SQL statement.
+ * g10/tofu.c (sqlite3_stepx): Make sure SQL only contains a single SQL
+ statement.
+
+ gpg: When the TOFU DB is in batch mode, periodically drop the locks.
+ * g10/tofu.c: Include <sched.h>.
+ (batch_update_started): New variable.
+ (begin_transaction): If we've been in batch mode for a while, then
+ commit any extant batch transactions.
+ (tofu_begin_batch_update): If we are not in batch mode, initialize
+ batch_update_started.
+
+2015-10-25 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Add workaround for broken getaddrinfo.
+ * dirmngr/dns-stuff.c (resolve_name_standard): On failure retry by
+ first resolving the CNAME.
+ (get_dns_cname): New.
+
+ * dirmngr/t-dns-stuff.c (main): Add option --cname.
+
+ dirmngr: Better handle systems without IPv6 or IPv4.
+ * dirmngr/dns-stuff.c (resolve_name_standard): Use AI_ADDRCONFIG.
+
+ dirmngr: Replace use of getnameinfo by resolve_dns_addr.
+ * dirmngr/ks-engine-hkp.c (my_getnameinfo): Remove.
+ (map_host): Use resolve_dns_addr.
+
+ dirmngr: Implement a getnameinfo wrapper.
+ * dirmngr/dns-stuff.h (DNS_NUMERICHOST): New.
+ (DNS_WITHBRACKET): New.
+ * dirmngr/dns-stuff.c (resolve_name_standard): Factor code out to...
+ (map_eai_to_gpg_error): new.
+ (resolve_addr_standard): New.
+ (resolve_dns_addr): New.
+
+ * dirmngr/ks-engine-hkp.c (is_ip_address): Move to ...
+ * dirmngr/dns-stuff.c (is_ip_address): here. Add support for non
+ bracketed v6 addresses.
+
+ * dirmngr/t-dns-stuff.c: Remove header netdb.h.
+ (main): Add option --bracket. Use resolve_dns_name instead of
+ getnameinfo.
+
+2015-10-23 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Provide an interface to patch TOFU updates.
+ * g10/tofu.c (struct db): Rename begin_transaction to savepoint_batch.
+ Rename end_transaction to savepoint_batch_commit. Update users.
+ Remove field rollback. Add fields savepoint_inner and
+ savepoint_inner_commit. Add field batch_update.
+ (dump_cache): New function.
+ (batch_update): New variable.
+ (begin_transaction). New function.
+ (end_transaction): New function.
+ (rollback_transaction): New function.
+ (tofu_begin_batch_update): New function.
+ (tofu_end_batch_update): New function.
+ (closedb): End any pending batch transaction.
+ (closedbs): Assert that none of the DBs have a started batch
+ transaction if we not in batch mode.
+ (record_binding): Use the begin_transaction, end_transaction and
+ rollback_transaction functions instead of including the SQL inline.
+ Also start a batch mode transaction if we are using the flat format.
+ (tofu_register): Use the begin_transaction, end_transaction and
+ rollback_transaction functions instead of including the SQL inline.
+ * g10/gpgv.c (tofu_begin_batch_update): New function.
+ (tofu_end_batch_update): New function.
+ * g10/test-stubs.c (tofu_begin_batch_update): New function.
+ (tofu_end_batch_update): New function.
+
+ gpg: Cache prepared SQL queries and open DB connections.
+ * g10/tofu.c: Include <stdarg.h>.
+ (prepares_saved) [DEBUG_TOFU_CACHE]: New variable.
+ (queries) [DEBUG_TOFU_CACHE]: New variable.
+ (struct db): Add fields prevp, begin_transaction, end_transaction,
+ rollback, record_binding_get_old_policy, record_binding_update,
+ record_binding_update2, get_policy_select_policy_and_conflict,
+ get_trust_bindings_with_this_email, get_trust_gather_other_user_ids,
+ get_trust_gather_other_keys, register_already_seen, and
+ register_insert.
+ [DEBUG_TOFU_CACHE]: Add field hits.
+ (STRINGIFY): New macro.
+ (STRINGIFY2): New macro.
+ (enum sqlite_arg_type): New enum.
+ (sqlite3_stepx): New function.
+ (combined_db): Remove variable.
+ (opendb): Don't cache the combined db.
+ (struct dbs): New struct. Update users to use this as the head of the
+ local DB list rather than overloading struct db.
+ (unlink_db): New function.
+ (link_db): New function.
+ (db_cache): New variable.
+ (db_cache_count): New variable.
+ (DB_CACHE_ENTRIES): Define.
+ (getdb): If the dbs specific cache doesn't include the DB, look at
+ DB_CACHE. Only if that also doesn't include the DB open the
+ corresponding DB.
+ (closedb): New function.
+ (opendbs): Don't open the combined DB. Just return an initialized
+ struct dbs.
+ (closedbs): Don't close the dbs specific dbs. Attach them to the
+ front of DB_CACHE. If DB_CACHE contains more than DB_CACHE_ENTRIES,
+ close enough dbs from the end of the DB_CACHE list such that DB_CACHE
+ only contains DB_CACHE_ENTRIES. Don't directly close the dbs, instead
+ use the new closedb function.
+ [DEBUG_TOFU_CACHE]: Print out some statistics.
+ (record_binding): Use sqlite3_stepx instead of sqlite3_exec or
+ sqlite3_exec_printf.
+ (get_policy): Likewise.
+ (get_trust): Likewise.
+ (tofu_register): Likewise.
+
+ gpg: Return the DBs meta-handle rather than the sqlite3 handle.
+ * g10/tofu.c (getdb): Return a struct db * instead of an sqlite *.
+ Update users.
+
+ gpg: Use the proper type.
+ * g10/options.h: Include "tofu.h".
+ (opt.tofu_default_policy): Change type to enum tofu_policy.
+ * g10/gpgv.c (enum tofu_policy): Don't redeclare.
+ * g10/test-stubs.c (enum tofu_policy): Likewise.
+
+2015-10-22 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Implement Tor mode for SRV RRs.
+ * dirmngr/dns-stuff.c (get_dns_cert): Factor adns init out to...
+ (my_adns_init): new.
+ (getsrv)[USE_ADNS]: Use my_adns_init.
+ (getsrv)[!USE_ADNS]: Return an error if Tor mode is active.
+
+ * dirmngr/t-dns-stuff.c: Add option --use-tor.
+
+ dirmngr: Do not use MAXDNAME.
+ * dirmngr/dns-stuff.c (getsrv): Replace MAXDNAME.
+ * dirmngr/dns-stuff.h (MAXDNAME): Remove.
+ (struct srventry): Use a fixed value instead of MAXDNAME.
+ * dirmngr/http.c (connect_server): Use DIMof instead of MAXDNAME.
+ Malloc a helper array.
+
+ Move SRV RR code from common/ to dirmngr/.
+ * common/srv.c: Merge into dirmngr/dns-stuff.c. Delete file.
+ * common/srv.h: Merge into dirmngr/dns-stuff.h. Delete file.
+ * common/Makefile.am (common_sources): Remove srv.c and srv.h.
+ * g10/keyserver.c: Do not include srv.h. The code using it is anyway
+ disabled.
+ * dirmngr/http.c: Remove header srv.h and stubs.
+ * dirmngr/t-dns-stuff.c: Add option --srv.
+
+2015-10-21 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Use the new DNS wrapper for the HTTP module.
+ * dirmngr/t-http.c (main): Init assuan sockets.
+ * dirmngr/http.c: Include dns-stuff.h.
+ (connect_server)[!HAVE_GETADDRINFO]: Remove all code.
+ (connect_server): Change to use resolve_dns_name.
+
+ dirmngr: Allow use of http.c if USE_NPTH is not defined.
+ * dirmngr/http.c (send_request): Always set the gnutls pull/push
+ functions.
+ (my_npth_read): Rename to ...
+ (my_gnutls_read) .. this. Use system read if !USE_NPTH.
+ (my_npth_write): Rename to ...
+ (my_gnutls_write) .. this. Use system write if !USE_NPTH.
+
+ dirmngr: Check that getaddrinfo is available.
+ * dirmngr/Makefile.am (t_http_SOURCES): Add dns-stuff.c.
+ (t_ldap_parse_uri_SOURCES): Ditto.
+ * dirmngr/dns-stuff.c: Bail out if neither ADNS nor getaddrinfo is
+ available.
+
+ dirmngr: Use the new DNS wrapper for the HKP engine.
+ * dirmngr/ks-engine-hkp.c (my_getnameinfo): Change arg type to
+ dns_addrinfo_t.
+ (map_host): Replace getaddrinfo by resolve_dns_name.
+
+ dirmngr: Implement a getaddrinfo wrapper.
+ * dirmngr/dns-stuff.h: Include some header files.
+ (dns_addinfo_t, dns_addrinfo_s): New.
+ * dirmngr/dns-stuff.c: Always include DNS related headers.
+ (free_dns_addrinfo): New.
+ (resolve_name_standard): New.
+ (resolve_dns_name): New.
+
+ * dirmngr/t-dns-stuff.c: Include netdb.h.
+ (main): Keep old default mode with no args but else print outout of
+ resolve_dns_name. Revamp option parser.
+
+ common: Add more replacement error codes.
+ * common/util.h (GPG_ERR_SERVER_FAILED): New.
+ (GPG_ERR_NO_KEY): New.
+ (GPG_ERR_NO_NAME): New.
+
+2015-10-21 Neal H. Walfield <neal at g10code.com>
+
+ gpg: If the saved trust model is unknown, default to tofu+pgp.
+ * g10/trustdb.c (init_trustdb): If the saved trust model is unknown,
+ default to tofu+pgp instead of pgp.
+
+ gpg: Don't accidentally free UTK_LIST.
+ * g10/trustdb.c (validate_keys): Don't free UTK_LIST.
+
+ gpg: When evaluating trust reg exps, treat tofu+pgp like pgp.
+ * g10/trustdb.c (validate_one_keyblock): When checking trust regular
+ expressions, treat the tofu+pgp trust model the same as the pgp trust
+ model.
+
+ gpg: If a key is ultimate trusted, return that in the tofu model.
+ * g10/tofu.c (get_trust): If the policy is auto or none, check if the
+ key is ultimately trusted. If so, return that.
+ (tofu_register): If the key is ultimately trusted, don't show any
+ statistics.
+ (tofu_get_validity): Likewise.
+
+ gpg: Keep the trust DB up to date for the tofu and tofu+pgp models.
+ * g10/trustdb.c (init_trustdb): Recognize tofu and tofu+pgp as
+ possibly saved trust models. Also register the ultimately trusted
+ keys if the trust model is tofu or tofu+pgp.
+ (check_trustdb): Don't skip if the trust model is tofu or tofu+pgp.
+ (update_trustdb): Likewise.
+ (tdb_check_trustdb_stale): Likewise.
+ (validate_keys): If the trust model is TOFU, just write out the
+ ultimately trusted keys.
+
+ gpg: Factor out code into a standalone function.
+ * g10/trustdb.c (tdb_keyid_is_utk): New function.
+ (add_utk): Use it.
+
+ dirmngr: Allow building with libassuan < 2.3.
+ * dirmngr/http.c (send_request): Use newer assuan function only if
+ available.
+
+2015-10-21 Neal H. Walfield <neal at g10code.com>
+ Andre Heinecke <aheinecke at intevation.de>
+
+ gpg: Make the tofu DB check and initialization atomic.
+ * g10/tofu.c (initdb): Make the version check and the database
+ initialization atomic.
+
+2015-10-21 Werner Koch <wk at gnupg.org>
+
+ build: Make --disable-g13 the default.
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-g13. Remove
+ --enable-gpgtar because that is enabled anyway.
+ * configure.ac: Do not build g13 by default.
+
+ dirmngr: Rename file dns-cert.c.
+ * dirmngr/dns-cert.c: Rename to dirmngr/dns-stuff.c.
+ * dirmngr/dns-cert.h: Rename to dirmngr/dns-stuff.h and change
+ includers.
+ * dirmngr/t-dns-cert.c: Rename to dirmngr/t-dns-stuff.c.
+ * dirmngr/Makefile.am: Adjust.
+
+ common: Add status code for use by g13.
+ * common/status.h (STATUS_PLAINTEXT_FOLLOWS): New.
+
+2015-10-20 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Prefer ADNS over system resolver.
+ * configure.ac (HAVE_ADNS_IF_TORMODE): New ac_define.
+ (USE_DNS_CERT): Prefer ADNS over the system resolver.
+ * dirmngr/dns-cert.c (tor_mode): New global var.
+ (enable_dns_tormode): New func.
+ (get_dns_cert): Use DNS resolver at 8.8.8.8 in tor-mode.
+ * dirmngr/server.c (cmd_dns_cert): If supported allow DNS requests.
+
+ w32: Allow building again.
+ * dirmngr/http.c (connect_server): Fix called function name.
+
+ build: Allow building without SQLlite support.
+ * configure.ac: Add option --dsiable-tofu and --disable-sqlite.
+ (NEED_SQLITE_VERSION): New var.
+ (USE_TOFU): New ac_define and am_conditional.
+ * autogen.sh (build-w32): Add PKG_CONFIG_LIBDIR to configure so that
+ pkg-config find the correct .pc file.
+
+ * g10/Makefile.am (tofu_source): New. Build only if enabled.
+ * g10/gpg.c (parse_trust_model)[!USE_TOFU]: Disable tofu models.
+ (parse_tofu_policy)[!USE_TOFU]: Disable all.
+ (parse_tofu_db_format)[!USE_TOFU]: Disable all.
+ (main) <aTOFUPolicy>[!USE_TOFU]: Skip.
+ * g10/keyedit.c (show_key_with_all_names_colon)[!USE_TOFU]: Do not
+ call tofu functions.
+ * g10/keylist.c (list_keyblock_colon)[!USE_TOFU]: Ditto.
+ * g10/trustdb.c (tdb_get_validity_core)[!USE_TOFU]: Skip tofu
+ processing.
+
+2015-10-20 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Don't die immediately if the TOFU DB is locked.
+ * g10/tofu.c (opendb): Don't die immediately if the DB is locked.
+
+ gpg: Improve output.
+ * g10/tofu.c (get_trust): Also show the binding when indicating a
+ conflict occurred.
+
+ gpg: Synchronize translation template.
+ * g10/tofu.c (show_statistics): Synchronize translation template.
+
+ gpg: When showing conflicts, also show bindings with no recorded sigs.
+ * g10/tofu.c (signature_stats_collect_cb): If the time_ago column is
+ NULL, then both time_ago and count should be 0.
+ (get_trust): Reverse the direction of the join so that we also get
+ statistics about bindings without any signatures.
+
+ gpg: Improve text.
+ * g10/tofu.c (show_statistics): Improve text.
+
+ gpg: Use the right variable to display the information.
+ * g10/tofu.c (get_trust): Use the right variable to display the
+ conflicting key.
+
+ gpg: Make failing to create a directory a soft error.
+ * g10/tofu.c (getdb): Don't exit if we can't create the directory.
+ Just return an error.
+
+ common: Make sure tilde expansion works for the mkdir functions.
+ * common/mkdir_p.c (gnupg_amkdir_p): Use make_filename_try on the
+ first directory component as well.
+
+ gpg: Remove unused prototype digest_algo_from_sig.
+ * g10/packet.h (digest_algo_from_sig): Remove prototype without a
+ corresponding implementation.
+
+2015-10-19 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow building with libassuan < 2.3.
+ * dirmngr/dirmngr.c (set_tor_mode): Use newer assuan function only if
+ available.
+ * dirmngr/http.c (http_raw_connect): Ditto.
+
+2015-10-19 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix --desig-revoke.
+ * g10/revoke.c (gen_desig_revoke): Add additional parameter ctrl.
+ Check that the secret key is available. If not, display an error
+ message.
+
+ gpg: Improve function documentation and some comments.
+ * g10/main.h: Improve function documentation.
+ * g10/packet.h.h: Improve function documentation.
+ * g10/sig-check.c: Improve function documentation and some comments.
+
+ gpg: Improve and regularize naming of signature checking functions.
+ * g10/packet.h (signature_check): Rename from this...
+ (check_signature): ... to this. Update users.
+ (signature_check2): Rename from this...
+ (check_signature2): ... to this. Update users.
+ * g10/sig-check.c (do_check): Rename from this...
+ (check_signature_end): ... to this. Update users.
+ (do_check_messages): Rename from this...
+ (check_signature_metadata_validity): ... to this. Update users.
+
+ gpg: Mark local function as static.
+ * g10/tdbio.c (put_record_into_cache): Mark as static.
+
+2015-10-19 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Print warning when rejecting weak digests.
+ * g10/misc.c (print_md5_rejected_note): Rename to ..
+ (print_digest_rejected_note): this. Parameterize function to take an
+ enum gcry_md_algos.
+ * g10/sig-check.c: Use print_digest_rejected_note() when rejecting
+ signatures.
+
+ gpg: Add option --weak-digest to gpg and gpgv.
+ * g10/options.h: Add additional_weak_digests linked list to opts.
+ * g10/main.h: Declare weakhash linked list struct and
+ additional_weak_digest() function to insert newly-declared weak
+ digests into opts.
+ * g10/misc.c: (additional_weak_digest): New function.
+ (print_digest_algo_note): Check for deprecated digests; use proper
+ gcry_md_algos type.
+ * g10/sig-check.c: (do_check): Reject weak digests in addition to MD5.
+ * g10/gpg.c: Add --weak-digest option to gpg.
+ * doc/gpg.texi: Document gpg --weak-digest option.
+ * g10/gpgv.c: Add --weak-digest option to gpgv.
+ * doc/gpgv.texi: Document gpgv --weak-digest option.
+
+2015-10-19 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Make --use-tor work - still leaks DNS.
+ * dirmngr/dirmngr.c (set_tor_mode): New.
+ (main, reread_configuration): Call it.
+ * dirmngr/http.c (http_raw_connect, send_request): Check whether TOR
+ mode is enabled if the FORCE_TOR flag is given.
+
+ dirmngr: Use Assuan socket wrappers for http.c.
+ * dirmngr/http.c: Include assuan.h. Changed all code taking a socket
+ descriptor from int to assuan_fd_t.
+ (my_unprotect, my_protect): New.
+ (my_connect): Remove.
+ (_my_socket_new, _my_socket_unref): use assuan_sock_close.
+ (connect_server): Use assuan_sock_connect, assuan_sock_new, and
+ assuan_sock_close.
+ * dirmngr/Makefile.am (t_common_ldadd): Add LIBASSUAN_LIBS.
+
+2015-10-19 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix formatting.
+ * g10/tofu.c (get_trust): Fix formatting.
+
+ gpg: Don't forget to free some memory.
+ * g10/tofu.c (tofu_register): Free SIG_DIGEST before returning.
+
+ gpg: If a conflict occurs in batch mode, record that.
+ * g10/tofu.c (get_trust): If a conflict occurs when MAY_ASK is false,
+ set conflict to the key. When prompting the user, don't show the
+ conflicting key if the conflicting key is the current key.
+
+2015-10-18 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence two more warnings.
+ * g10/trustdb.c (tdb_get_validity_core): Silence a warning.
+ * g10/tofu.c (tofu_register): Move SIG_DIGEST computation to the top
+ so that it is not uninitialized in case of an early error.
+
+ gpg: Fix harmless compiler warnings.
+ * g10/tofu.h (_tofu_GET_POLICY_ERROR): New. This avoids warnings
+ about undefined enum values in a switch.
+ * g10/trustdb.h (_tofu_GET_TRUST_ERROR): New.
+ * g10/tofu.c (TIME_AGO_FUTURE_IGNORE): Move to the top.
+ (opendbs): Avoid compiler warning (use braces).
+ (GET_POLICY_ERROR): Replace define by enum _tofu_GET_POLICY_ERROR.
+ (get_policy): Remove assert.
+ (GET_TRUST_ERROR): Replace by _tofu_GET_TRUST_ERROR macro.
+ (show_statistics): Undef MIN_SECS et al. after use.
+
+ common: Avoid warning about const char ** assignment.
+ * common/mkdir_p.c (gnupg_amkdir_p): Also strdup first item. Return
+ an error on malloc failure.
+ (gnupg_mkdir_p): Fix type of dirs and tmp_dirs.
+
+ Move http module from common/ to dirmngr/.
+ * common/http.c: Move to ../dirmngr/.
+ * common/http.h: Move to ../dirmngr/.
+ * common/t-http.c: Move to ../dirmngr/.
+ * common/tls-ca.pem: Move to ../dirmngr/.
+ * common/Makefile.am: Do not build libcommontls.a libcommontlsnpth.a.
+ Remove http.c related stuff.
+ * po/POTFILES.in: Move http.c to dirmngr/.
+ * dirmngr/Makefile.am (EXTRA_DIST): Add tls-ca.pem.
+ (module_maint_tests): New.
+ (noinst_PROGRAMS): Add module_maint_tests.
+ (dirmngr_SOURCES): Add http.c and http.h.
+ (dirmngr_LDADD): Remove libcommontlsnpth.
+ (t_common_ldadd): Ditto.
+ (t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
+ (t_ldap_parse_uri_SOURCES): Add http.c.
+ (t_ldap_parse_uri_CFLAGS): Build without npth.
+ ($(PROGRAMS)): Do not require libcommontls.a libcommontlsnpth.a.
+ * dirmngr/dirmngr.h, dirmngr/ks-engine.h: Fix include of http.h.
+
+2015-10-18 Neal H. Walfield <neal at g10code.com>
+
+ g10: Fix assert.
+ * g10/tofu.c (get_trust): Fix assert.
+
+ g10: Add TOFU support.
+ * configure.ac: Check for sqlite3.
+ (SQLITE3_CFLAGS): AC_SUBST it.
+ (SQLITE3_LIBS): Likewise.
+ * g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
+ (gpg2_SOURCES): Add tofu.h and tofu.c.
+ (gpg2_LDADD): Add $(SQLITE3_LIBS).
+ * g10/tofu.c: New file.
+ * g10/tofu.h: New file.
+ * g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
+ (tofu_db_format): Define.
+ * g10/packet.h (PKT_signature): Add fields digest and digest_len.
+ * g10/gpg.c: Include "tofu.h".
+ (cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
+ oTOFUDBFormat.
+ (opts): Add them.
+ (parse_trust_model): Recognize the tofu and tofu+pgp trust models.
+ (parse_tofu_policy): New function.
+ (parse_tofu_db_format): New function.
+ (main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
+ Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
+ * g10/mainproc.c (do_check_sig): If the signature is good, copy the
+ hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
+ * g10/trustdb.h (get_validity): Add arguments sig and may_ask. Update
+ callers.
+ (tdb_get_validity_core): Add arguments sig and may_ask. Update
+ callers.
+ * g10/trust.c (get_validity) Add arguments sig and may_ask. Pass them
+ to tdb_get_validity_core.
+ * g10/trustdb.c: Include "tofu.h".
+ (trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
+ (tdb_get_validity_core): Add arguments sig and may_ask. If
+ OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
+ level. Combine it with the computed PGP trust level, if appropriate.
+ * g10/keyedit.c: Include "tofu.h".
+ (show_key_with_all_names_colon): If the trust mode is tofu or
+ tofu+pgp, then show the trust policy.
+ * g10/keylist.c: Include "tofu.h".
+ (public_key_list): Also show the PGP stats if the trust model is
+ TM_TOFU_PGP.
+ (list_keyblock_colon): If the trust mode is tofu or
+ tofu+pgp, then show the trust policy.
+ * g10/pkclist.c: Include "tofu.h".
+ * g10/gpgv.c (get_validity): Add arguments sig and may_ask.
+ (enum tofu_policy): Define.
+ (tofu_get_policy): New stub.
+ (tofu_policy_str): Likewise.
+ * g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
+ (enum tofu_policy): Define.
+ (tofu_get_policy): New stub.
+ (tofu_policy_str): Likewise.
+ * doc/DETAILS: Describe the TOFU Policy field.
+ * doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
+ --trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
+ * tests/openpgp/Makefile.am (TESTS): Add tofu.test.
+ (TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
+ tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
+ (CLEANFILES): Add tofu.db.
+ (clean-local): Add tofu.d.
+ * tests/openpgp/tofu.test: New file.
+ * tests/openpgp/tofu-2183839A-1.txt: New file.
+ * tests/openpgp/tofu-BC15C85A-1.txt: New file.
+ * tests/openpgp/tofu-EE37CF96-1.txt: New file.
+ * tests/openpgp/tofu-keys.asc: New file.
+ * tests/openpgp/tofu-keys-secret.asc: New file.
+
+2015-10-16 Neal H. Walfield <neal at g10code.com>
+
+ common: Prefix the mkdir functions with gnupg_. Make args const.
+ * common/mkdir_p.h (mkdir_p): Rename from this...
+ (gnupg_mkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+ (amkdir_p): Rename from this...
+ (gnupg_amkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+ * common/mkdir_p.c (mkdir_p): Rename from this...
+ (gnupg_mkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+ (amkdir_p): Rename from this...
+ (gnupg_amkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+
+2015-10-14 NIIBE Yutaka <gniibe at fsij.org>
+
+ cleanup: Fix confusion between gpg_error_t and gpg_err_code_t.
+ * dirmngr/crlcache.c (hash_dbfile): Use gpg_error_t for ERR.
+ * kbx/keybox-update.c (keybox_set_flags): Call
+ gpg_err_code_from_syserror.
+
+2015-10-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2015-10-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Try hard to use MDC also for sign+symenc.
+ * g10/encrypt.c (use_mdc): Make it a global func.
+ * g10/sign.c (sign_symencrypt_file): Use that function to decide
+ whether to use an MDC.
+ * tests/openpgp/conventional-mdc.test: Add a simple test case.
+
+2015-10-09 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.9.
+
+2015-10-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: simplify agent_get_passphrase.
+ * agent/call-pinentry.c (agent_get_passphrase): Simplify.
+
+ agent: fix agent_askpin.
+ * agent/call-pinentry.c (agent_askpin): Fix off-by-one error.
+
+ agent: Fix function return type for check_cb and agent_askpin.
+ * agent/call-pinentry.c (unlock_pinentry): Return gpg_error_t.
+ (start_pinentry, setup_qualitybar): Likewise.
+ (agent_askpin): Fix return value check of check_cb.
+ * agent/command-ssh.c (reenter_compare_cb): Return gpg_error_t.
+ (ssh_identity_register): Fix return value check of agent_askpin.
+ * agent/cvt-openpgp.c (try_do_unprotect_cb): Return gpg_error_t.
+ * agent/findkey.c (try_unprotect_cb): Likewise.
+ * agent/genkey.c (reenter_compare_cb): Return gpg_error_t.
+ (agent_ask_new_passphrase): Fix return value check of agent_askpin.
+
+2015-10-08 Andre Heinecke <aheinecke at intevation.de>
+
+ dirmngr: Default to http protocol for http-proxy.
+ * common/http.c (send_request): Fix handling for hostname:port string.
+
+2015-10-08 Werner Koch <wk at gnupg.org>
+
+ common: Allow building of mkdir_p.c for Windows.
+ * common/mkdir_p.c: Change license and comment debug statements.
+ (amkdir_p, mkdir_p): Fail on malloc error and use default_errsource to
+ build an error code. Change return value to gpg_error_t.
+ (amkdir_p): Use gnupg_mkdir.
+
+ * common/membuf.c: Include util.h first to avoid redefined macro
+ warnings.
+
+ gpg: Add option --print-dane-records.
+ * g10/options.h (opt): Add field "print_dane_records".
+ * g10/gpg.c (oPrintDANERecords): new.
+ (opts): Add --print-dane-records.
+ (main): Set that option.
+ * g10/export.c (do_export): Remove EXPORT_DANE_FORMAT handling.
+ (do_export_stream): Add EXPORT_DANE_FORMAT handling.
+ * g10/keylist.c (list_keyblock_pka): Implement DANE record printing.
+
+ * g10/gpgv.c (export_pubkey_buffer): New stub.
+ * g10/test-stubs.c (export_pubkey_buffer): New stub.
+
+ gpg: Pass CTRL parameter to all key listing functions.
+ * g10/keylist.c (public_key_list): Add arg CTRL.
+ (secret_key_list): Ditto.
+ (list_all, list_one): Ditto.
+ (locate_one): Ditto.
+ (list_keyblock_pka): Ditto.
+ (list_keyblock): Ditto.
+ (list_keyblock_direct): Ditto.
+ * g10/keygen.c (proc_parameter_file): Add arg CTRL.
+ (read_parameter_file): Ditto.
+ (quick_generate_keypair): Ditto.
+ (do_generate_keypair): Ditto.
+ (generate_keypair): Pass arg CTRL.
+ * g10/gpg.c (main): Pass arg CTRL to quick_generate_keypair.
+
+2015-10-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove unfinished experimental code to export as S-expressions.
+ * g10/options.h (EXPORT_SEXP_FORMAT): Remove.
+ (EXPORT_DANE_FORMAT): New.
+ * g10/export.c (parse_export_options): Remove "export-sexp-format".
+ (export_seckeys): Adjust for removed option.
+ (export_secsubkeys): Ditto.
+ (do_export): Prepare for DANE format.
+ (build_sexp, build_sexp_seckey): Remove.
+ (do_export_stream): Remove use of removed functions.
+
+2015-10-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Add new --auto-key-locate mechanism "dane".
+ * g10/call-dirmngr.c (gpg_dirmngr_dns_cert): Allow fetching via DANE.
+ * g10/keyserver.c (keyserver_import_cert): Add arg "dane_mode".
+ * g10/options.h (AKL_DANE): New.
+ * g10/getkey.c (get_pubkey_byname): Implement AKL_DANE.
+ (parse_auto_key_locate): Ditto.
+
+ dirmngr: Addlow fetching keys using OpenPGP DANE.
+ * dirmngr/server.c (cmd_dns_cert): Add option --dane.
+
+ dirmngr: Improve DNS code to retrieve arbitrary records.
+ * dirmngr/dns-cert.c (get_dns_cert): Add hack to retrieve arbitrary
+ resource records.
+ * dirmngr/dns-cert.h (DNS_CERTTYPE_RRBASE): New.
+ (DNS_CERTTYPE_RR61): New.
+
+ dirmngr: Change DNS code to make additions easier.
+ * dirmngr/dns-cert.c (get_dns_cert) [!USE_ADNS]: Change loop to allow
+ adding more resource types.
+
+ dirmngr: Make commands RELOADDIRMNGR and KILLDIRMNGR work properly.
+ * dirmngr/server.c (cmd_killdirmngr): Set assuan close flag.
+ (cmd_reloaddirmngr): Use check_owner_permission.
+
+ dirmngr: Do tilde expansion for --hkp-cacert.
+ * dirmngr/dirmngr.c (parse_rereadable_options): Do tilde expansion and
+ check for cert file existance in option --hkp-cacert.
+
+ gpg: Fail decryption for AES etc message w/o MDC.
+ * g10/mainproc.c (proc_encrypted): Fail for modern messages w/o MDC.
+
+2015-10-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix verification of signature for smartcard.
+ * agent/pksign.c (agent_pksign_do): Use public key smartcard.
+
+ agent: Fix non-allocation for pinentry_loopback.
+ * agent/call-pinentry.c (agent_get_passphrase): Don't allocate, it will
+ be allocated by pinentry_loopback.
+
+2015-10-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Install a dirmngr.conf file.
+ * g10/dirmngr-conf.skel: New.
+ * g10/Makefile.am (EXTRA_DIST): Add file.
+ (install-data-local, uninstall-local): Install that file.
+ * g10/openfile.c (copy_options_file): Add arg "name", return a value,
+ simplify with xstrconcat, and factor warning message out to:
+ (try_make_homedir): here. Also install dirmngr.conf.
+ * g10/options.skel: Remove --keyserver entry.
+
+ gpg: Deprecate the --keyserver option.
+ * g10/keyserver.c (keyserver_refresh): Change return type to
+ gpg_error_t. Use gpg_dirmngr_ks_list to print the name of the
+ keyserver to use.
+ (keyserver_search): Do not print the "no keyserver" error
+ message. The same error is anyway returned from dirmngr.
+ * g10/call-dirmngr.c (ks_status_parm_s): Add field "keyword".
+ (ks_status_cb): Handle other status keywords.
+ (gpg_dirmngr_ks_list): New.
+ * tools/gpgconf-comp.c (gc_options_gpg): Deprecate "keyserver".
+ (gc_options_dirmngr): Add "Keyserver" group and "keyserver".
+
+ dirmngr: Add option --keyserver.
+ * dirmngr/dirmngr.c (oKeyServer): New.
+ (opts): Add "keyserver".
+ (parse_rereadable_options): Parse that options
+ (main): Add option to the gpgconf list.
+ * dirmngr/dirmngr.h (opt): Add field "keyserver".
+ * dirmngr/server.c (ensure_keyserver): New.
+ (make_keyserver_item): New. Factored out from
+ (cmd_keyserver): here. Call ensure_keyserver.
+ (cmd_ks_search): Call ensure_keyserver.
+ (cmd_ks_get): Ditto.
+ (cmd_ks_fetch): Ditto.
+ (cmd_ks_put): Ditto.
+
+ dirmngr: Make clear that --use-tor is not yet ready for use.
+ * dirmngr/dirmngr.c (main): Print a warning if --use-tor has been
+ given.
+ * tools/gpgconf-comp.c (gc_options_dirmngr): Make --use-tor invisible.
+
+ gpgconf: Change displayed name of Dirmngr to "Key Acquirer".
+ * tools/gpgconf-comp.c (gc_component): Change printed name.
+
+2015-10-02 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix use-after-free due to a realloc shrinking.
+ * dirmngr/ks-engine-hkp.c (map_host): Do not use original pointer
+ after realloc.
+
+ agent: Fix alignment problem with the second passphrase struct.
+ * agent/genkey.c (agent_ask_new_passphrase): Use a separate malloc for
+ PI2. Check return value of the malloc function.
+ * agent/command-ssh.c (ssh_identity_register): Use a separate malloc
+ for PI2. Wipe PI2.
+
+2015-10-01 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix a practical hang after use of --faked-system-time.
+ * g10/sign.c (update_keysig_packet): Bail out if we would need to long
+ for a new timestamp.
+
+ gpg: Print more info with "check selfsig".
+ * g10/keyedit.c (print_and_check_one_sig): Print more Some sigsub
+ packets.
+
+ gpg: Add debug helper to --edit-keys's check sub-command.
+ * g10/keyedit.c (print_and_check_one_sig): Add arg "extended" and
+ print an asterisk for the chosen selfsig.
+ (check_all_keysigs): Add arg "only_selfsig"
+ (keyedit_menu) <cmdCHECK>: Add optional arg "selfsig".
+
+2015-10-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ common: Fix strsplit.
+ * common/stringhelp.c (strsplit): Fix arguments order.
+
+2015-09-30 Neal H. Walfield <neal at g10code.com>
+
+ common: Add mkdir_p.
+ * common/mkdir_p.c: New file.
+ * common/mkdir_p.h: New file.
+ * common/Makefile.am (common_sources): Add mkdir_p.c and mkdir_p.h.
+
+ common: Remove unused files.
+ * common/xmalloc.c: Remove file.
+ * common/xmalloc.h: Remove file.
+
+ common: Include <gpg-error.h>.
+ * common/logging.h: Include <gpg-error.h>.
+
+2015-09-29 Neal H. Walfield <neal at g10code.com>
+
+ g10: Remove unused struct cmp_help_context_s.
+ * g10/sig-check.c (struct cmp_help_context_s) Remove unused struct.
+
+ g10: Avoid an unnecessary copy.
+ * g10/sig-check.c (signature_check2): Avoid copying PK to RET_PK.
+ Instead, directly use the provided storage. If none is provided
+ allocate some.
+
+2015-09-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ ssh: Fix fingerprint computation for EdDSA key.
+ * common/ssh-utils.c (get_fingerprint): Handle the prefix of 0x40.
+ * common/t-ssh-utils.c (sample_keys): Add a new key.
+
+ agent: RSA signature verification by gpg-agent.
+ * g10/sign.c (do_sign): Let verify signature by gpg-agent.
+ * agent/pksign.c (agent_pksign_do): Call gcry_pk_verify for RSA.
+
+2015-09-28 Werner Koch <wk at gnupg.org>
+
+ common: Provide two new error code replacements.
+ * common/util.h (GPG_ERR_FALSE, GPG_ERR_TRUE): Rew replcements.
+
+ common: Change calling convention for gnupg_spawn_process.
+ * common/exechelp.h (GNUPG_SPAWN_NONBLOCK): New.
+ (GNUPG_SPAWN_RUN_ASFW, GNUPG_SPAWN_DETACHED): Macro to replace the
+ numbers.
+ * common/exechelp.h (gnupg_spawn_process): Change function to not take
+ an optional stream for stdin but to return one.
+ * common/exechelp-posix.c (gnupg_spawn_process): Implement change.
+ (create_pipe_and_estream): Add args outbound and nonblock.
+ * common/exechelp-w32.c (gnupg_spawn_process): Implement change.
+
+2015-09-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Handle error correctly.
+ * scd/apdu.c (apdu_connect): Initialize variables and check an error
+ of apdu_get_status_internal.
+
+2015-09-22 Werner Koch <wk at gnupg.org>
+
+ ssh: Add 256, 384 and 521 bit test keys for the fingerprint.
+ * common/t-ssh-utils.c (sample_keys): Add 3 new keys.
+
+ ssh: Fix fingerprint computation for 384 bit ECDSA keys.
+ * common/ssh-utils.c (get_fingerprint): Fix hashed string.
+
+2015-09-19 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix importing ECC key.
+ * agent/cvt-openpgp.c (convert_from_openpgp_main): Only encrypted
+ parameters are stored as opaque.
+ (apply_protection): ARRAY members are all normal, non-opaque MPI.
+ (extract_private_key): Get public key as normal, non-opaque MPI.
+ Remove support of ECC key with '(flags param)'.
+ Remove support of "ecdsa" and "ecdh" keys of our experiment.
+
+ scd: Fix KEYTOCARD handling for ECC key.
+ * scd/app-openpgp.c (ecc_writekey): Only public key can be native
+ format.
+
+2015-09-19 Neal H. Walfield <neal at g10code.com>
+
+ common: Add new function strlist_length.
+ * common/strlist.c (strlist_length): New function.
+
+2015-09-18 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Change displayed name of Dirmngr to "Network Manager".
+ * tools/gpgconf-comp.c (gc_component): Change printed name.
+
+ dirmngr: Add option --use-tor as a stub.
+ * dirmngr/dirmngr.h (opt): Add field "use_tor".
+ * dirmngr/dirmngr.c (oUseTor): New.
+ (opts): Add --use-tor.
+ (parse_rereadable_options): Set option.
+ (main): Tell gpgconf about that option.
+
+ * dirmngr/crlfetch.c (crl_fetch): Pass TOR flag to the http module and
+ return an error if LDAP is used in TOR mode.
+ (ca_cert_fetch): Return an error in TOR mode.
+ (start_cert_fetch): Ditto.
+ * dirmngr/ks-engine-finger.c (ks_finger_fetch): Pass TOR flag to the
+ http module.
+ * dirmngr/ks-engine-hkp.c (send_request): Ditto.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+ * dirmngr/ks-engine-ldap.c (ks_ldap_get): Return an error in TOR mode.
+ (ks_ldap_search): Ditto.
+ (ks_ldap_put): Ditto.
+ * dirmngr/ocsp.c (do_ocsp_request): Ditto. Also pass TOR flag to the
+ http module.
+
+ * dirmngr/server.c (option_handler): Add "honor-keyserver-url-used".
+ (cmd_dns_cert): Return an error in TOR mode.
+ (cmd_getinfo): Add subcommand "tor"
+ * tools/gpgconf-comp.c (gc_options_dirmngr): Add TOR group.
+
+ gpg: Report a conflict between honor-keyserver-url and TOR.
+ * g10/call-dirmngr.c (create_context): Send option and print a verbose
+ error.
+
+ http: Add flag to force use of TOR (part 1)
+ * common/http.h (HTTP_FLAG_FORCE_TOR): New.
+ * common/http.c (http_raw_connect, send_request): Detect flag and
+ return an error for now.
+
+2015-09-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ scd: Fix ccid-driver timeout for OpenPGPcard v2.1.
+ * scd/ccid-driver.c (CCID_CMD_TIMEOUT): New.
+ (ccid_transceive_apdu_level, ccid_transceive): Use.
+
+2015-09-16 Werner Koch <wk at gnupg.org>
+
+ agent: New option --pinentry-invisible-char.
+ * agent/gpg-agent.c (oPinentryInvisibleChar): New.
+ (opts): Add option.
+ (parse_rereadable_options): Set option.
+ * agent/agent.h (opt): Add field pinentry_invisible_char.
+ * agent/call-pinentry.c (start_pinentry): Pass option to pinentry.
+
+ g13: Move some code to a separate module.
+ * g13/g13-common.c, g13/g13-common.h: New.
+ * g13/Makefile.am (g13_SOURCES): Add new files.
+ * g13/g13.c (g13_errors_seen): Move to g13-common.c.
+ (cmdline_conttype): New.
+ (main): Use g13_init_signals and g13_install_emergency_cleanup.
+ (emergency_cleanup, g13_exit): Move to g13-common.c.
+ * g13/g13.h: Move OPT and some other code to g13-common.h.
+
+ gpg: Fix skip function dummy parameter.
+ * g10/trustdb.c (search_skipfnc): Fix dummy argument
+
+ gpg: Change last commit to avoid extra translations.
+ * g10/keyedit.c (keyedit_menu): Do not print usage hints in expert
+ mode.
+
+2015-09-16 Neal H. Walfield <neal at g10code.com>
+
+ g10: Improve error message.
+ * g10/keyedit.c (keyedit_menu): When complaining that a user ID or key
+ must be selected, indicate what command to use to do this.
+
+ g10: Be more careful when merging self-signed data.
+ * g10/getkey.c (merge_selfsigs_main): Stop looking for self-signed
+ data belonging to the public key when we encounter an attribute packet
+ or a subkey packet, not just a user id packet. When looking for
+ self-signed data belonging to a user id packet, stop when we see a
+ user attribute packet.
+
+ g10: Simplify some complicated boolean expressions.
+ * g10/getkey.c (finish_lookup): Simplify logic.
+
+ g10: Also mark revoked and expired keys as unusable.
+ * g10/getkey.c (skip_unusable): Also mark the key as unusable if it
+ has been revoked or has expired.
+
+ g10: Release resources when returning an error in get_seckey.
+ * g10/getkey.c (get_seckey): If the key doesn't have a secret key,
+ release *PK.
+
+ g10: Improve documentation and comments for getkey.c.
+ * g10/getkey.c: Improve documentation and comments for most
+ functions. Move documentation for public functions from here...
+ * g10/keydb.h: ... to here.
+
+ g10: Remove unused function have_any_secret_key.
+ * g10/getkey.c (have_any_secret_key): Remove function.
+
+ g10: Bring cache semantics closer to non-cache semantics.
+ * g10/getkey.c (get_pubkey_fast): When reading from the cache, only
+ consider primary keys.
+
+ g10: Break out of the loop earlier.
+ * g10/getkey.c (have_secret_key_with_kid): Once we find the relevent
+ key or subkey, stop searching.
+
+ g10: Don't skip legacy keys if the search mode is KEYDB_SEARCH_MODE_NEXT
+ * g10/getkey.c (lookup): Also don't skip legacy keys if the search
+ mode is KEYDB_SEARCH_MODE_NEXT.
+
+ g10: Remove unused function get_seckeyblock_byfprint.
+ * g10/keydb.h (get_seckeyblock_byfprint): Remove prototype.
+ * g10/getkey.c (get_seckeyblock_byfprint): Remove function.
+
+ g10: Remove unused function get_seckey_byfprint.
+ * g10/keydb.h (get_seckey_byfprint): Remove prototype.
+ * g10/getkey.c (get_seckey_byfprint): Remove function.
+
+ g10: Simplify get_seckey_byname: it was never called with NAME not NULL.
+ * g10/keydb.h (get_seckey_byname): Rename from this...
+ (get_seckey_default): ... to this. Drop the parameter name. Update
+ users.
+ * g10/getkey.c (get_seckey_byname): Rename from this...
+ (get_seckey_default): ... to this. Drop the parameter name. Drop the
+ code which assumed that NAME is not NULL.
+
+ g10: Eliminate the redundant function get_keyblock_byfprint.
+ * g10/keydb.h (get_keyblock_byfprint): Remove prototype. Replace use
+ of this function with get_pubkey_byfprint.
+ * g10/getkey.c (get_pubkey_byname): Remove function.
+
+ g10: Simplify semantics of get_pubkey_byname.
+ * g10/getkey.c (get_pubkey_byname): If R_KEYBLOCK is not NULL, return
+ the keyblock in R_KEYBLOCK independent of whether PK is set or not.
+
+ g10: Eliminate the redundant function get_pubkey_byname.
+ * g10/getkey.c (get_pubkey_byname): Remove function.
+ (lookup): Replace use of get_pubkey_byname by get_pubkey_byfprint.
+
+ g10: Eliminate the redundant function get_pubkey_end.
+ * g10/keydb.h (get_pubkey_end): Remove declaration. Replace use of
+ function with getkey_end.
+ * g10/getkey.c (get_pubkey_byname): Remove function.
+
+ g10: Eliminate the redundant function get_pubkey_next.
+ * g10/keydb.h (get_pubkey_next): Remove prototype.
+ * g10/getkey.c (get_pubkey_next): Remove function.
+ * g10/keylist.c (locate_one): Use getkey_next instead of
+ get_pubkey_next.
+
+ kbx: Change skipfnc's prototype so that we can provide all information.
+ * kbx/keybox-search-desc.h (struct keydb_search_desc.skipfnc): Change
+ third parameter to be the index of the user id packet in the keyblock
+ rather than the packet itself. Update users.
+
+ g10: Remove unused prototype (get_pubkey_byfpr).
+ * g10/keydb.h (get_pubkey_byfpr): Remove unused prototype.
+
+ g10: Remove unused function (get_pubkey_bynames).
+ * g10/keydb.h (get_pubkey_bynames): Remove prototype.
+ * g10/getkey.c (get_pubkey_bynames): Remove function.
+
+ g10: Simplify code. Turn struct getkey_ctx_s.found_key into an argument
+ * g10/getkey.c (struct getkey_ctx_s): Remove field found_key.
+ (lookup): Add argument ret_found_key. If not NULL, set it to the
+ found key. Update callers.
+ (pk_from_block): Add argument found_key. Use it instead of
+ CTX->FOUND_KEY. Update callers.
+ (finish_lookup): Return a KBNODE (the found key) instead of an int.
+ Don't set CTX->FOUND_KEY. Return the found key instead.
+
+ g10: Remove unused field struct getkey_ctx_s.kbpos.
+ * g10/getkey.c (struct getkey_ctx_s): Remove field kbpos.
+ (getkey_end): Don't clear CTX->KBPOS.
+
+ g10: Simplify code: remove field struct getkey_ctx_s.keyblock.
+ * g10/getkey.c (struct getkey_ctx_s): Remove field keyblock.
+ (finish_lookup): Add parameter keyblock. Update caller to pass this.
+ (lookup): Add new local variable keyblock. Use this instead of
+ ctx->keyblock for referencing the keyblock.
+
+2015-09-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix registering SSH Key of Ed25519.
+ * agent/command-ssh.c (stream_read_string): Add the prefix of 0x40.
+
+2015-09-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2015-09-10 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.8.
+
+ tests: Silence the 5gb-packet test.
+ * tests/openpgp/4gb-packet.test: Send output to /dev/null.
+
+ g10: Fix make distcheck problem.
+ * g10/test.c: Include string.h.
+ (prepend_srcdir): New. Taken from Libgcrypt.
+ (test_free): New.
+ * g10/t-keydb.c (do_test): Malloc the filename.
+ * g10/Makefile.am (AM_CPPFLAGS): Remove -DSOURCE_DIR
+ (EXTRA_DIST): Add t-keydb-keyring.kbx.
+
+ g10: Improve portability of the new test driver.
+ * g10/test.c: Include stdio.h and stdlib.h.
+ (verbose): New.
+ (print_results): Rename to exit_tests.
+ (main): Remove atexit and call exit_tests. Set verbose.
+ (ASSERT, ABORT): Call exit_tests instead of exit.
+
+2015-09-09 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow sending much larger keyblocks.
+ * dirmngr/server.c (MAX_CERT_LENGTH): Increase to 16k.
+ (MAX_KEYBLOCK_LENGTH): Increase to 20M.
+
+2015-09-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Force key attribute change for writekey.
+ * scd/app-openpgp.c (change_rsa_keyattr): New.
+ (change_keyattr_from_string): Use change_rsa_keyattr.
+ (rsa_writekey): Call change_rsa_keyattr when different size.
+ (ecc_writekey): Try to change key attribute.
+
+ scd: KEYNO cleanup.
+ * scd/app-openpgp.c (get_public_key, send_keypair_info, do_readkey)
+ (change_keyattr, change_keyattr_from_string, ecc_writekey, do_genkey)
+ (compare_fingerprint, check_against_given_fingerprint): KEYNO starts
+ from 0.
+
+2015-09-02 Neal H. Walfield <neal at g10code.com>
+
+ g10: Remove unused field req_algo.
+ * g10/packet.h (PKT_public_key): Remove unused field req_algo. Remove
+ users.
+ * g10/getkey.c (struct getkey_ctx_s): Remove unused field req_algo.
+ Remove users.
+
+ g10: Use a symbolic constant instead of a literal.
+ * g10/trustdb.c (KEY_HASH_TABLE_SIZE): Define.
+ (new_key_hash_table): Use KEY_HASH_TABLE_SIZE instead of a literal.
+ (release_key_hash_table): Likewise.
+ (test_key_hash_table): Likewise.
+ (add_key_hash_table): Likewise.
+
+ g10: Add test for keydb as well as new testing infrastructure.
+ * g10/Makefile.am (EXTRA_DIST): Add test.c.
+ (AM_CPPFLAGS): Add -DSOURCE_DIR="\"$(srcdir)\"".
+ (module_tests): Add t-keydb.
+ (t_keydb_SOURCES): New variable.
+ (t_keydb_LDADD): Likewise.
+ * g10/t-keydb.c: New file.
+ * g10/t-keydb-keyring.kbx: New file.
+ * g10/test-stubs.c: New file.
+ * g10/test.c: New file.
+
+ g10: Make the keyblock cache per-handle rather than global.
+ * g10/keydb.c (keyblock_cache): Don't declare this variable. Instead...
+ (struct keyblock_cache): ... turn its type into this first class
+ object...
+ (struct keydb_handle): ... and instantiate it once per database
+ handle. Update all users.
+ (keydb_rebuild_caches): Don't invalidate the keyblock cache.
+
+ g10: If iobuf_seek fails when reading from the cache, do a hard read.
+ * g10/keydb.c (keydb_get_keyblock): If the iobuf_seek fails when
+ reading from the cache, then simply clear the cache and try reading
+ from the database.
+
+ iobuf: Reduce verbosity of test.
+ * common/t-iobuf.c (main): Reduce verbosity.
+
+ iobuf: Add the IOBUF_INPUT_TEMP type to improve input temp handling.
+ * common/iobuf.h (enum iobuf_use): Add new member, IOBUF_INPUT_TEMP.
+ * common/iobuf.c (iobuf_temp_with_content): Create the iobuf as an
+ IOBUF_INPUT_TEMP, not an IOBUF_INPUT buffer. Assert that LENGTH ==
+ A->D.SIZE.
+ (iobuf_push_filter2): If A is an IOBUF_INPUT_TEMP, then make the new
+ filter an IOBUF_INPUT filter and set its buffer size to
+ IOBUF_BUFFER_SIZE.
+ (underflow): If A is an IOBUF_INPUT_TEMP, then just return EOF; don't
+ remove already read data.
+ (iobuf_seek): If A is an IOBUF_INPUT_TEMP, don't discard the buffered
+ data.
+ (iobuf_alloc): Allow USE == IOBUF_INPUT_TEMP.
+ (pop_filter): Allow USE == IOBUF_INPUT_TEMP.
+ (iobuf_peek): Allow USE == IOBUF_INPUT_TEMP.
+ (iobuf_writebyte): Fail if USE == IOBUF_INPUT_TEMP.
+ (iobuf_write): Fail if USE == IOBUF_INPUT_TEMP.
+ (iobuf_writestr): Fail if USE == IOBUF_INPUT_TEMP.
+ (iobuf_flush_temp): Fail if USE == IOBUF_INPUT_TEMP.
+
+ iobuf: Rename IOBUF_TEMP to IOBUF_OUTPUT_TEMP.
+ * common/iobuf.h (enum iobuf_use): Rename IOBUF_TEMP to
+ IOBUF_OUTPUT_TEMP. Update users.
+
+ iobuf: Use a first-class enum.
+ * common/iobuf.h (enum iobuf_use): Name the IOBUF_OUTPUT, etc. enum.
+ (struct iobuf_struct): Change the field use's type to it.
+
+ iobuf: Fix test.
+ * common/t-iobuf.c (content_filter): If there is nothing to read,
+ don't forget to set *LEN to 0.
+ (main): Fix checks.
+
+2015-09-01 Werner Koch <wk at gnupg.org>
+
+ agent: Protect commit 135b1e3 against misbehaving Libgcrypt.
+ * agent/command-ssh.c (ssh_key_to_blob): Check DATALEN.
+
+ gpg: Remove option --no-sig-create-check.
+ * g10/gpg.c (opts): Remove --no-sig-create-check.
+ * g10/options.h (struct opt): Remove field no_sig_create_check.
+ * g10/sign.c (do_sign): Always check unless it is RSA and we are using
+ Libgcrypt 1.7.
+
+ common: Assume an utf-8 locale on iconv errors.
+ * common/utf8conv.c (handle_iconv_error): Use utf-8 as fallback.
+
+ common: Fix regression in building argpase.c standalone.
+ * common/argparse.c (is_native_utf8) [GNUPG_MAJOR_VERSION]: New.
+
+2015-08-31 Neal H. Walfield <neal at g10code.com>
+
+ g10: Don't leak memory if we fail to initialize a new database handle.
+ * g10/keydb.c (keydb_new): If we fail to open a keyring or keybox
+ correctly release all resources.
+
+ g10: Improve interface documentation of the keydb API.
+ * g10/keydb.c: Improve code comments and documentation of internal
+ interfaces. Improve documentation of public APIs and move that to...
+ * g10/keydb.h: ... this file.
+
+ g10: Don't cache search results if the search didn't scan the whole DB.
+ * g10/keydb.c (struct keydb_handle): Add new field is_reset.
+ (keydb_new): Initialize hd->is_reset to 1.
+ (keydb_locate_writable): Set hd->is_reset to 1.
+ (keydb_search): Set hd->is_reset to 0. Don't cache a key not found if
+ the search started from the beginning of the database.
+
+ g10: Have keydb_search_first call keydb_search_reset before searching.
+ * g10/keydb.c (keydb_search_first): Reset the handle before starting
+ the search.
+
+ g10: Remove unused parameter.
+ * g10/keydb.h (keydb_locate_writable): Remove unused parameter
+ reserved. Update users.
+
+2015-08-31 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix SSH public key for EdDSA.
+ * agent/command-ssh.c (ssh_key_to_blob): Remove the prefix 0x40.
+
+2015-08-26 Neal H. Walfield <neal at g10code.com>
+
+ g10: Simplify cache. Only include data that is actually used.
+ * g10/keydb.c (struct kid_list_s): Rename from this...
+ (struct kid_not_found_cache_bucket): ... to this. Update users.
+ Remove field state.
+ (kid_list_t): Remove type.
+ (KID_NOT_FOUND_CACHE_BUCKETS): Define. Use this instead of a literal.
+ (kid_found_table): Rename from this...
+ (kid_not_found_cache_bucket): ... to this. Update users.
+ (kid_found_table_count): Rename from this...
+ (kid_not_found_cache_count): ... to this. Update users.
+ (kid_not_found_p): Only return whether a key with the specified key id
+ is definitely not in the database.
+ (kid_not_found_insert): Remove parameter found. Update callers.
+ (keydb_search): Only insert a key id in the not found cache if it is
+ not found. Rename local variable once_found to already_in_cache.
+
+2015-08-25 Werner Koch <wk at gnupg.org>
+
+ Add configure option --enable-build-timestamp.
+ * configure.ac (BUILD_TIMESTAMP): Set to "<none>" by default.
+
+ gpg: Emit ERROR status for key signing failures.
+ * g10/keyedit.c (sign_uids): Write an ERROR status for a signing
+ failure.
+ (menu_adduid, menu_addrevoker, menu_revsig): Ditto.
+ (menu_revuid, menu_revkey, menu_revsubkey): Ditto.
+
+ gpg: Print a new FAILURE status after most commands.
+ * common/status.h (STATUS_FAILURE): New.
+ * g10/cpr.c (write_status_failure): New.
+ * g10/gpg.c (main): Call write_status_failure for all commands which
+ print an error message here.
+ * g10/call-agent.c (start_agent): Print an STATUS_ERROR if we can't
+ set the pinentry mode.
+
+2015-08-24 Neal H. Walfield <neal at g10code.com>
+
+ agent: Raise the maximum password length. Don't hard code it.
+ * agent/agent.h (MAX_PASSPHRASE_LEN): Define.
+ * agent/command-ssh.c (ssh_identity_register): Use it instead of a
+ hard-coded literal.
+ * agent/cvt-openpgp.c (convert_from_openpgp_main): Likewise.
+ * agent/findkey.c (unprotect): Likewise.
+ * agent/genkey.c (agent_ask_new_passphrase): Likewise.
+
+2015-08-24 Werner Koch <wk at gnupg.org>
+
+ sm: Support secret key export via the Assuan interface.
+ * sm/server.c (cmd_export): Add options --secret, --raw, and --pkcs12.
+
+2015-08-23 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow sending of Zack's key.
+ * dirmngr/server.c (MAX_KEYBLOCK_LENGTH): Increase to 1 MiB.
+
+ gpg: Fix regression in packet parser from Aug 19.
+ * g10/parse-packet.c (parse): Use an int to compare to -1. Use
+ buf32_to_ulong.
+
+ gpg: Show not found keys with --locate-key --verbose.
+ * g10/keylist.c (locate_one): Print a diagnostic for a not-found key.
+
+2015-08-21 Neal H. Walfield <neal at g10code.com>
+
+ common: Don't incorrectly reject 4 GB - 1 sized packets.
+ * g10/parse-packet.c (parse): Don't reject 4 GB - 1 sized packets.
+ Add the constraint that the type must be 63.
+ * kbx/keybox-openpgp.c (next_packet): Likewise.
+ * tests/openpgp/4gb-packet.asc: New file.
+ * tests/openpgp/4gb-packet.test: New file.
+ * tests/openpgp/Makefile.am (TESTS): Add 4gb-packet.test.
+ (TEST_FILES): Add 4gb-packet.asc.
+
+ common: Don't assume on-disk layout matches in-memory layout.
+ * g10/packet.h (PKT_signature): Change revkey's type from a struct
+ revocation_key ** to a struct revocation_key *. Update users.
+
+ common: Don't incorrectly copy packets with partial lengths.
+ * g10/parse-packet.c (parse): We don't handle copying packets with a
+ partial body length to an output stream. If this occurs, log an error
+ and abort.
+
+ common: Check parameters more rigorously.
+ * g10/parse-packet.c (dbg_copy_all_packets): Check that OUT is not
+ NULL.
+ (copy_all_packets): Likewise.
+
+ common: Don't continuing processing on error.
+ * g10/parse-packet.c (dbg_parse_packet): Also return if parse returns
+ an error.
+ (parse_packet): Likewise.
+ (dbg_search_packet): Likewise.
+ (search_packet): Likewise.
+
+ common: Better respect the packet's length when reading it.
+ * g10/parse-packet.c (parse_signature): Make sure PKTLEN doesn't
+ underflow. Be more careful that a read doesn't read more data than
+ PKTLEN says is available.
+
+2015-08-20 Werner Koch <wk at gnupg.org>
+
+ po: Add lost translation of validity strings.
+ * po/POTFILES.in (trust.c): Add missing file.
+ * po/de.po: Changed German validity strings.
+ * doc/help.de.txt: Ditto.
+
+2015-08-20 Neal H. Walfield <neal at g10code.com>
+
+ g10/parse-packet.c:parse: Try harder to not ignore an EOF.
+ * g10/parse-packet.c (parse): Be more robust: make sure to process any
+ EOF.
+
+ g10/parse-packet.c: Replace literal with symbolic expression.
+ * g10/parse-packet.c (dump_hex_line): Use sizeof rather than the
+ buffer's size.
+
+ Add documentation for g10/parse-packet.c.
+ * g10/packet.h: Add documentation for functions defined in
+ parse-packet.c.
+ * g10/parse-packet.c: Improve comments for many functions.
+
+ g10/packet.h: Remove unused argument from enum_sig_subpkt.
+ * g10/packet.h (enum_sig_subpkt): Remove argument RET_N. Update
+ callers.
+ * g10/parse-packet.c (enum_sig_subpkt): Remove argument RET_N.
+
+ g10/parse-packet.c:mpi_read: Detect EOF and correct boundary conditions.
+ * g10/parse-packet.c (mpi_read): Improve documentation. Correctly
+ handle an EOF. On overflow, correctly return the number of bytes read
+ from the pipeline.
+
+ common/iobuf.c: Make control flow more obvious.
+ * common/iobuf.c (iobuf_read): Make control flow more obvious.
+ (iobuf_get_filelength): Likewise.
+ (iobuf_get_fd): Likewise.
+ (iobuf_seek): Likewise.
+
+ common/iobuf.c: Add some sanity checks to catch programmer bugs.
+ * common/iobuf.c (iobuf_alloc): Check that BUFSIZE is not 0.
+ (iobuf_readbyte): Check that A is an input filter. Check that the
+ amount of read data is at most the amount of buffered data.
+ (iobuf_read): Check that A is an input filter.
+ (iobuf_writebyte): Check that A is not an input filter.
+ (iobuf_writestr): Check that A is not an input filter.
+ (iobuf_flush_temp): Check that A is not an input filter.
+
+ common/iobuf.c:iobuf_write_temp: Elide redundant code.
+ * common/iobuf.c (iobuf_write_temp): Don't repeat iobuf_flush_temp.
+ Use it directly.
+
+ common/iobuf.c: Have iobuf_writestr use iobuf_write, not iobuf_writebyte
+ * common/iobuf.c (iobuf_write): Don't write a byte at a time. Use
+ iobuf_write.
+
+ common/iobuf: Improve documentation and code comments.
+ common/iobuf.h: Improve documentation and code comments.
+ common/iobuf.c: Likewise.
+
+ common/iobuf.c: Adjust buffer size of filters in front of temp filters.
+ * common/iobuf.c (iobuf_push_filter2): If the head filter is a temp
+ filter, use IOBUF_BUFFER_SIZE for the new filter.
+
+ common/iobuf.c: Buffered data should not be processed by new filters.
+ * common/iobuf.c (iobuf_push_filter2): If the pipeline is an output or
+ temp pipeline, the new filter shouldn't assume ownership of the old
+ head's internal buffer: the data was written before the filter was
+ added.
+ * common/t-iobuf.c (double_filter): New function.
+ (main): Add test cases for the above bug.
+
+ common/iobuf.c: Flush the pipeline in iobuf_temp_to_buffer.
+ * common/iobuf.c (iobuf_temp_to_buffer): Flush each filter in the
+ pipeline and copy the data from the last (not the first) filter's
+ internal buffer.
+
+ common/iobuf.c: Combine iobuf_open, iobuf_create and iobuf_openrw.
+ * common/iobuf.c (do_open): New function, which is a generalization of
+ iobuf_open, iobuf_Create, iobuf_openrw.
+ (iobuf_open): Call do_open.
+ (iobuf_create): Likewise.
+ (iobuf_openrw): Likewise.
+
+ common/iobuf.h: Remove iobuf_open_fd_or_name.
+ * common/iobuf.h (iobuf_open_fd_or_name): Remove prototype. Replace
+ use with either iobuf_open or iobuf_fdopen_nc, as appropriate.
+ * common/iobuf.c (iobuf_open): Remove function.
+
+ common/iobuf.c: Rename iobuf_flush and make it a static function.
+ * common/iobuf.h (iobuf_flush): Remove prototype.
+ * common/iobuf.c (filter_flush): New static prototype.
+ (iobuf_flush): Rename...
+ (filter_flush): ... to this. Make static. Simplify code. Update
+ callers.
+
+ common/iobuf.c: Don't abort freeing a pipeline if freeing a filter fails
+ * common/iobuf.c (iobuf_cancel): Don't abort freeing a pipeline if
+ freeing a filter fails. This needs to a memory leak. Instead, keep
+ freeing and return the error code of the first filter that fails.
+
+ common/iobuf.c: Improve iobuf_peek.
+ * common/iobuf.c (underflow): Take additional parameter
+ clear_pending_eof. If not set, don't clear a pending eof when
+ returning EOF. Update callers.
+ (iobuf_peek): Fill the internal buffer, if needed, to be able to
+ better satisfy any request.
+
+ common/iobuf.c: When requested, fill the buffer even if it is not empty.
+ * common/iobuf.c (underflow): Don't require that the buffer be empty.
+ When called, fill any available space.
+
+ common/t-iobuf.c: Add a test case for multiple EOFs.
+ common/t-iobuf.c (main): Add a test case for multiple EOFs in an INPUT
+ pipeline.
+
+ common/iobuf.c: Better respect boundary conditions in iobuf_read_line.
+ * common/iobuf.c (iobuf_read_line): Be more careful with boundary
+ conditions.
+ * common/iobuf.h: Include <gpg-error.h>.
+ * common/t-iobuf.c: New file.
+ * common/Makefile.am (module_tests): Add t-iobuf.
+ (t_mbox_util_LDADD): New variable.
+
+ common/iobuf.c: Fix filter type for iobuf_temp_with_content.
+ * common/iobuf.c (iobuf_temp_with_content): Set the filter type to
+ IOBUF_INPUT, not IOBUF_TEMP, which is only for output filters that
+ write into a dynamic buffer.
+
+ common/iobuf.h: Remove unimplemented prototypes.
+ * common/iobuf.h (iobuf_unread): Remove unimplemented prototype.
+ (iobuf_clear_eof): Likewise.
+ (iobuf_append): Likewise.
+
+ common/iobuf.c: Refactor code to not need the desc field.
+ * common/iobuf.h (struct iobuf_struct): Remove field desc.
+ * common/iobuf.c (iobuf_desc): New function. When a filter's
+ description is needed, use this instead of the filter's desc field.
+
+ common/iobuf.h: Clarify semantics of nofast. Simplify implementation.
+ * common/iobuf.h (struct iobuf_struct): Clarify semantics of nofast.
+ Simplify use of nofast to implement just these semantics.
+
+ common/iobuf.c: Remove dead code (directfp).
+ * common/iobuf.h (struct iobuf_struct): Remove field directfp. Remove
+ all uses of it.
+
+ common/iobuf.c: Remove dead code (opaque).
+ * common/iobuf.h (struct iobuf_struct): Remove field opaque. Remove
+ all uses of it.
+
+ common/iobuf.h: Replace further use of literals with symbolic constants.
+ * common/iobuf.c: Move BLOCK_FILTER_INPUT,
+ BLOCK_FILTER_OUTPUT_BLOCK_FILTER_TEMP from here...
+ * common/iobuf.h: ... to here and rename to IOBUF_INPUT, IOBUF_OUTPUT
+ and IOBUF_TEMP, respectively. Where appropriate, use these macros
+ instead of a literal.
+
+2015-08-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid linking to Libksba.
+ * kbx/keybox.h (KEYBOX_WITH_X509): Do not define.
+ * sm/Makefile.am (AM_CPPFLAGS): Define it here.
+ (common_libs): Change to libkeybox509.a
+ * g10/Makefile.am (AM_CFLAGS): remove KSBA_CFLAGS.
+ (gpg2_LDADD, gpgv2_LDADD): Remove KSBA_LIBS
+ * kbx/Makefile.am (noinst_LIBRARIES): Add libkeybox509.a.
+ (libkeybox509_a_SOURCES): New.
+ (libkeybox_a_CFLAGS): New.
+ (libkeybox509_a_CFLAGS): New.
+ (kbxutil_CFLAGS): New.
+ * kbx/keybox-search.c (has_keygrip) [!KEYBOX_WITH_X509]: Declare args
+ as unused.
+
+2015-08-16 Ben Kibbey <bjk at luxsci.net>
+
+ Fix pinentry loopback and passphrase contraints.
+ * agent/command.c (cmd_get_passphrase): Don't repeat passphrase for
+ pinentry loopback mode.
+ * agent/genkey.c (check_passphrase_constraints): Immediately return when
+ pinentry mode is loopback.
+
+ Fix sending INQUIRE_MAXLEN for symmetric data.
+ * g10/passphrase.c (passphrase_to_dek_ext): Write the status message.
+
+2015-08-15 Ben Kibbey <bjk at luxsci.net>
+
+ Inform a user about inquire length limit.
+ * common/status.h (INQUIRE_MAXLEN): New.
+ * g10/call-agent.c (default_inquire_cb): Send STATUS_INQUIRE_MAXLEN.
+ client when inquiring a passphrase over pinentry-loopback.
+
+ Allow --gen-key to inquire a passphrase.
+ * g10/gpg.c (main): test for --command-fd during --gen-key parse.
+
+ When --command-fd is set then imply --batch to let gpg inquire a
+ passphrase rather than requiring a pinentry.
+
+2015-08-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.7.
+
+2015-08-10 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: fix ECC key handling.
+ * agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
+ (convert_transfer_key): CURVE is the name of curve.
+
+2015-08-08 Neal H. Walfield <neal at g10code.com>
+
+ common/iobuf.c: Replace use of literals with symbolic constants.
+ * common/iobuf.c (BLOCK_FILTER_INPUT): Define. Where appropriate, use
+ this instead of a literal.
+ (BLOCK_FILTER_OUTPUT): Likewise.
+ (BLOCK_FILTER_TEMP): Likewise.
+
+2015-08-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow gpgv to work with a trustedkeys.kbx file.
+ * g10/keydb.h (KEYDB_RESOURCE_FLAG_GPGVDEF): New.
+ * g10/keydb.c (keydb_add_resource): Take care of new flag.
+ * g10/gpgv.c (main): Use new flag.
+
+ agent: Add option --force to the DELETE_KEY command.
+ * agent/findkey.c (agent_delete_key): Add arg "force".
+ * agent/command.c (cmd_delete_key): Add option --force.
+
+ common: Change alias for Curve25519 to "cv25519".
+ * common/openpgp-oid.c (oidtable): Change alias.
+
+2015-08-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove duplicated printing of the curve name in "sub" lines.
+ * g10/keylist.c (list_keyblock_print): Do not print extra curve name.
+
+ gpg: Add commands "fpr *" and "grip" to --edit-key.
+ * g10/keyedit.c (cmdGRIP): New.
+ (cmds): Add command "grip".
+ (keyedit_menu) <cmdFPR>: Print subkeys with argument "*".
+ (keyedit_menu) <cmdGRIP>: Print keygrip.
+ (show_key_and_fingerprint): Add arg "with_subkeys".
+ (show_key_and_grip): New.
+ * g10/keylist.c (print_fingerprint): Add mode 4.
+
+ gpg: Adjust UID line indentation for common key algos.
+ * g10/keylist.c (list_keyblock_print): Change UID line indentation
+ * g10/mainproc.c (list_node): Ditto.
+
+2015-08-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ Curve25519 support.
+ * agent/cvt-openpgp.c (get_keygrip): Handle Curve25519.
+ (convert_secret_key, convert_transfer_key): Ditto.
+ * common/openpgp-oid.c (oidtable): Add Curve25519.
+ (oid_crv25519, openpgp_oid_is_crv25519): New.
+ * common/util.h (openpgp_oid_is_crv25519): New.
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Handle the case
+ with Montgomery curve which uses x-only coordinate.
+ * g10/keygen.c (gen_ecc): Handle Curve25519.
+ (ask_curve): Change the API and second arg is to return subkey algo.
+ (generate_keypair, generate_subkeypair): Follow chage of ask_curve.
+ * g10/keyid.c (keygrip_from_pk): Handle Curve25519.
+ * g10/pkglue.c (pk_encrypt): Handle Curve25519.
+ * g10/pubkey-enc.c (get_it): Handle the case with Montgomery curve.
+ * scd/app-openpgp.c (ECC_FLAG_DJB_TWEAK): New.
+ (send_key_attr): Work with general ECC, Ed25519, and Curve25519.
+ (get_public_key): Likewise.
+ (ecc_writekey): Handle flag_djb_tweak.
+
+ common: extend API of openpgp_oid_to_curve for canonical name.
+ * common/openpgp-oid.c (openpgp_oid_to_curve): Add CANON argument.
+ * common/util.h: Update.
+ * g10/import.c (transfer_secret_keys): Follow the change.
+ * g10/keyid.c (pubkey_string): Likewise.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Likewise.
+ * parse-packet.c (parse_key): Likewise.
+ * scd/app-openpgp.c (send_key_attr, get_public_key): Likewise.
+
+2015-08-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix ecc_oid.
+ * scd/app-openpgp.c (ecc_oid): Call with OIDBUF.
+
+ scd: Fix ECC support.
+ * scd/app-openpgp.c (send_key_attr): Send KEYNO.
+ (get_public_key): Fix SEXP composing.
+ (ecc_writekey): Fix OID length calculation.
+ (ecc_oid): Prepend the length before query.
+ (parse_algorithm_attribute): Handle the case the curve is not available.
+
+2015-08-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix duplicate key import due to legacy key in keyring.
+ * g10/keydb.c (keydb_search_fpr): Skip legacy keys.
+
+ gpg: Properly handle legacy keys while looking for a secret key.
+ * g10/getkey.c (have_secret_key_with_kid): Skip legacy keys.
+
+2015-07-31 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix endless loop for expired keys given by fpr.
+ * g10/getkey.c (lookup): Disable keydb caching when continuing a
+ search.
+
+2015-07-29 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not return "Legacy Key" from lookup if a key is expired.
+ * g10/getkey.c (lookup): Map GPG_ERR_LEGACY_KEY.
+
+ gpg: Indicate secret keys and cards in a key-edit listing.
+ * g10/keyedit.c (sign_uids): Add arg "ctrl".
+ (show_key_with_all_names_colon): Ditto.
+ (show_key_with_all_names): Ditto.
+
+ * g10/keyedit.c (show_key_with_all_names): Print key record
+ indicators by checking with gpg-agent.
+ (show_key_with_all_names): Ditto. May now also print sec/sbb.
+
+2015-07-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove the edit-key toggle command.
+ * g10/keyedit.c (cmds): Remove helptext from "toggle".
+ (keyedit_menu): Remove "toggle" var and remove the sub/pub check
+ against toggle.
+
+ common,w32: Avoid unused var warning about msgcache.
+ * common/i18n.c (USE_MSGCACHE): New.
+ (msgcache) [!USE_MSGCACHE]: Do not define.
+ (i18n_localegettext): Repalce #if conditions by USE_MSGCACHE.
+
+ w32: Try more places to find an installed Pinentry.
+ * common/homedir.c (get_default_pinentry_name): Re-implement to
+ support several choices for Windows.
+
+2015-07-26 Werner Koch <wk at gnupg.org>
+
+ scd: Fix size_t/unsigned int mismatch.
+ * scd/app-openpgp.c (ecc_writekey): Use extra var n.
+
+ Replace GNUPG_GCC_A_ macros by GPGRT_ATTR_ macros.
+ * common/util.h: Provide replacement for GPGRT_ATTR_ macros when using
+ libgpg-error < 1.20.
+ * common/mischelp.h: Ditto.
+ * common/types.h: Ditto.
+
+2015-07-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: support any curves defined by libgcrypt.
+ * g10/call-agent.h (struct agent_card_info_s): Add curve field.
+ * g10/call-agent.c (learn_status_cb): Use curve name.
+ * g10/card-util.c (card_status): Show pubkey name.
+ * scd/app-openpgp.c (struct app_local_s): Record OID and flags.
+ (store_fpr): Use ALGO instead of key type.
+ (send_key_attr): Use curve name instead of OID.
+ (get_public_key): Clean up by OID to curve name.
+ (ecc_writekey): Support any curves in libgcrypt.
+ (do_genkey, do_auth, ): Follow the change.
+ (ecc_oid): New.
+ (parse_algorithm_attribute): Show OID here.
+
+2015-07-23 Peter Wu <peter at lekensteyn.nl>
+
+ build: ignore scissor line for the commit-msg hook.
+ * build-aux/git-hooks/commit-msg: Stop processing more lines when the
+ scissor line is encountered.
+
+2015-07-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Format change to specify "rsa2048" for KEY-ATTR.
+ * g10/card-util.c (do_change_keysize): Put "rsa".
+ * scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
+ Change the command format.
+ (rsa_writekey): Check key type.
+ (do_writekey): Remove "ecdh" and "ecdsa" support which was available
+ in experimental libgcrypt before 1.6.0.
+
+2015-07-22 Werner Koch <wk at gnupg.org>
+
+ Avoid a leading double slash in make_filename.
+ * common/stringhelp.c (do_make_filename): Special case leading '/'.
+
+2015-07-21 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: change_keyattr_from_string for ECC.
+ * scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
+ Support ECC.
+ (rsa_writekey): Don't change key attribute.
+
+2015-07-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Use openpgpdefs.h for constants.
+ * scd/app-openpgp.c: Include openpgpdefs.h.
+
+2015-07-16 Neal H. Walfield <neal at g10code.com>
+
+ Don't segfault if the first 'auto-key-locate' option is 'clear'.
+ * g10/getkey.c (free_akl): If AKL is NULL, just return.
+
+2015-07-10 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Support non-NLS build.
+ * agent/agent.h: Use ENABLE_NLS and define L_() macro.
+
+2015-07-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Remove unused files.
+ * scd/Makefile.am (sc_copykeys_*): Remove.
+ * scd/sc-copykeys.c: Remove.
+ * scd/pcsc-wrapper.c: Remove.
+ * scd/{card-common.h,card-dinsig.c,card-p15.c,card.c}: Remove.
+
+2015-07-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Use canonical name for curve.
+ * g10/import.c (transfer_secret_keys): Use canonical name.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Return NULL on error.
+ * g10/keyid.c (pubkey_string): Follow change of openpgp_curve_to_oid.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
+ * g10/parse-packet.c (parse_key): Ditto.
+
+2015-07-03 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ drop long-deprecated gpgsm-gencert.sh.
+ * tools/gpgsm-gencert.sh: remove deprecated script entirely. It is
+ fully replaced by gpgsm --gen-key
+ * doc/tools.texi: remove gpgsm-gencert.sh documentation
+ * .gitignore: no longer ignore gpgsm-gencert.sh manpage
+ * doc/Makefile.am: quit making the manpage
+ * tools/Makefile.am: quit distributing the script
+ * doc/howto-create-a-server-cert.texi: overhaul documentation to use
+ gpgsm --gen-key and tweak explanations
+
+2015-07-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ scd: Support AES decryption for OpenPGPcard v3.0.
+ * scd/app-openpgp.c (do_decipher): Support AES decryption.
+
+2015-07-01 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.6.
+
+2015-07-01 Daiki Ueno <ueno at gnu.org>
+
+ agent: Unset INSIDE_EMACS on gpg-agent startup.
+ * agent/gpg-agent.c (main): Unset INSIDE_EMACS envvar.
+
+2015-07-01 Werner Koch <wk at gnupg.org>
+
+ common: Implement i18n_localegettext.
+ * common/i18n.c (msg_cache_s, msg_cache_head_s): New.
+ (msgcache): New.
+ (i18n_localegettext): Implement locale dependent lookup.
+
+2015-06-30 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Pass DBUS_SESSION_BUS_ADDRESS for gnome3.
+ * common/session-env.c (stdenvnames): Add DBUS_SESSION_BUS_ADDRESS.
+
+2015-06-30 Werner Koch <wk at gnupg.org>
+
+ Flag the L_() function with attribute format_arg.
+ * agent/agent.h (LunderscorePROTO): New.
+ * common/util.h (GNUPG_GCC_ATTR_FORMAT_ARG): New.
+ * common/i18n.h (GNUPG_GCC_ATTR_FORMAT_ARG): New. Use for
+ i18n_localegettext. Expand LunderscorePROTO.
+ * agent/genkey.c (check_passphrase_constraints): Use xtryasprintf
+ again to keep the old translations.
+
+ agent: Use different translation func for Pinentry strings.
+ * po/Makevars (XGETTEXT_OPTIONS): Add keyword "L_".
+ * common/i18n.c (i18n_localegettext): New stub.
+ * common/i18n.h: Expand the LunderscoreIMPL macro.
+ * agent/agent.h (L_): New.
+ (LunderscoreIMPL): New.
+ * agent/call-pinentry.c (setup_qualitybar): Add arg ctrl anc change
+ caller.
+ * agent/findkey.c (try_unprotect_cb): Add local var ctrl.
+ * agent/genkey.c (check_passphrase_constraints): Replace xtryasprintf
+ by xtrystrdup to avoid gcc warning. Unfortinately this changes the
+ string.
+ (agent_ask_new_passphrase): Cleanup the use of initial_errtext.
+
+ gpg: Make show-sig-subpackets work again.
+ * g10/gpg.c (parse_list_options): Fix offset for subpackets.
+
+2015-06-29 Werner Koch <wk at gnupg.org>
+
+ agent: Prepare for Libassuan with Cygwin support.
+ * agent/gpg-agent.c (create_server_socket): Add arg "cygwin". Call
+ assuan_sock_set_flag if Assuan version is recent enough.
+ (main): Create ssh server socket with Cygwin flag set.
+
+2015-06-29 Neal H. Walfield <neal at gnu.org>
+
+ Show passphrase constraints errors as password prompt errors.
+ * agent/agent.h (check_passphrase_constraints): Add parameter
+ failed_constraint and remove parameter silent. Update callers.
+ * agent/genkey.c (check_passphrase_constraints): Add parameter
+ failed_constraint and remove parameter silent. If FAILED_CONSTRAINT
+ is not NULL and OPT.ENFORCE_PASSPHRASE_CONSTRAINTS is FALSE, save the
+ error text in *FAILED_CONSTRAINT and don't call take_this_one_anyway
+ or take_this_one_anyway2. If FAILED_CONSTRAINT is NULL, act as if
+ SILENT was set.
+ (agent_ask_new_passphrase): Change initial_errtext's type from a const
+ char * to a char *. Pass it to check_passphrase_constraints. If it
+ contains malloc's memory, free it.
+
+2015-06-29 Neal H. Walfield <neal at g10code.com>
+
+ Improve documentation for default-cache-ttl and default-cache-ttl-ssh.
+ * doc/gpg-agent.texi (Agent Options): Improve documentation for
+ default-cache-ttl and default-cache-ttl-ssh.
+
+ Don't raise max-cache-ttl to default-cache-ttl.
+ * agent/gpg-agent.c (finalize_rereadable_options): Don't raise
+ max-cache-ttl to default-cache-ttl. Likewise for max-cache-ttl-ssh
+ and default-cache-ttl-ssh.
+
+ Improve the description of old packets with an indeterminate length.
+ * g10/parse-packet.c (parse): Make the description more accurate when
+ listing packets: old format packets don't support partial lengths,
+ only indeterminate lengths (RFC 4880, Section 4.2).
+
+2015-06-29 Werner Koch <wk at gnupg.org>
+
+ agent: Add --verify to the PASSWD command.
+ * agent/command.c (cmd_passwd): Add option --verify.
+
+ agent,w32: Do not create a useless socket with --enable-putty-support.
+ * agent/agent.h (opt): Remove field ssh_support.
+ * agent/gpg-agent.c (ssh_support): New. Replace all opt.ssh_support
+ by this.
+ (main): Do not set ssh_support along with setting putty_support.
+
+ gpgsm: Add command option "offline".
+ * sm/server.c (option_handler): Add "offline".
+ (cmd_getinfo): Ditto.
+ * sm/certchain.c (is_cert_still_valid):
+ (do_validate_chain):
+ * sm/gpgsm.c (gpgsm_init_default_ctrl): Default "offline" to the value
+ of --disable-dirmngr.
+ * sm/call-dirmngr.c (start_dirmngr_ext): Better also check for
+ ctrl->offline.
+
+2015-06-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Support button flag and AES key data for OpenPGPcard v3.0.
+ * scd/app-openpgp.c (do_getattr, show_caps, app_select_openpgp):
+ Support button and symmetric decryption.
+ (do_setattr): Support setting AESKEY.
+
+2015-06-25 Andre Heinecke <aheinecke at intevation.de>
+
+ sm: Fix cert storage for ephemeral certs.
+ * sm/keydb.c (keydb_store_cert): Clear ephemeral flag for
+ existing certs if store should not be ephemeral.
+
+2015-06-23 Werner Koch <wk at gnupg.org>
+
+ Allow use of debug flag names for all tools.
+ * g13/g13.c: Make use of debug_parse_flag.
+ * scd/scdaemon.c: Ditto.
+ * sm/gpgsm.c: Ditto
+ * agent/gpg-agent.c: Ditto. But do not terminate on "help"
+ * dirmngr/dirmngr.c: Ditto.
+
+ common: Improve fucntion parse_debug_flag.
+ * common/miscellaneous.c (parse_debug_flag): Add hack not to call
+ exit. Add "none" and "all" flags.
+
+2015-06-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: pinpad workaround for PC/SC implementations.
+ * scd/adpu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Bigger buffer
+ for TPDU card reader.
+
+2015-06-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow debug flag names for --debug.
+ * g10/gpg.c (opts): Change arg for oDebug to a string.
+ (debug_flags): New; factored out from set_debug.
+ (set_debug): Remove "--debug-level help". Use parse_debug_flag to
+ print the used flags.
+ (main): Use parse_debug_flag for oDebug.
+
+ common: Add function parse_debug_flag.
+ * common/miscellaneous.c (parse_debug_flag): New.
+ * common/util.h (struct debug_flags_s): New.
+
+ common: Add function strtokenize.
+ * common/stringhelp.c: Include assert.h.
+ (strtokenize): New.
+ * common/t-stringhelp.c (test_strtokenize): New.
+
+ gpg: Fix regression due to recent commit 6500f33.
+ * g10/keydb.c (kid_list_s): Keep a state in the table.
+ (kid_not_found_table): Rename to kid_found_table.
+ (n_kid_not_found_table): Rename to kid_found_table_count.
+ (kid_not_found_p): Return found state.
+ (kid_not_found_insert): Add arg found.
+ (keydb_search): Store found state in the table.
+
+2015-06-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix Cherry ST-2000 support for pinpad input.
+ * scd/apdu.c (pcsc_vendor_specific_init): Set pinmax to 15.
+ * scd/ccid-driver.c (ccid_transceive_secure): Add zero for the
+ template of APDU.
+
+2015-06-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Print number of good signatures with --check-sigs.
+ * g10/keylist.c (keylist_context): Add field good_sigs.
+ (list_keyblock_print): Updated good_sigs.
+ (print_signature_stats): Print number of good signatures and use
+ log_info instead of tty_printf.
+
+ gpg: Improve speed of --check-sigs and --lish-sigs.
+ * g10/keydb.c (kid_list_t): New.
+ (kid_not_found_table, n_kid_not_found_table): New.
+ (kid_not_found_p, kid_not_found_insert, kid_not_found_flush): New.
+ (keydb_insert_keyblock): Flush the new cache.
+ (keydb_delete_keyblock): Ditto.
+ (keydb_update_keyblock): Ditto.
+ (keydb_search): Use the new cache.
+ (keydb_dump_stats): New.
+ * g10/gpg.c (g10_exit): Dump keydb stats.
+
+2015-06-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Add more log_clock calls to keydb.c.
+ * g10/keydb.c (keydb_get_keyblock): Add log_clock calls.
+
+ gpg: Print available debug flags using "--debug-level help".
+ * g10/gpg.c (set_debug): Add "help" option and use a table for the
+ flags.
+
+ gpg: Fix export problem in case an old keyring has PGP-2 keys.
+ * g10/export.c (do_export_stream): Skip legacy keys.
+
+2015-06-18 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix the cleanup zombies fix (685b782).
+ * dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Do not close the
+ stdout reader after EOF from read_log_data.
+ * dirmngr/crlcache.c (crl_cache_reload_crl): Close the reader before
+ the next iteration.
+
+2015-06-17 Werner Koch <wk at gnupg.org>
+
+ agent: Print a warning for obsolete options.
+ * g10/misc.c (obsolete_scdaemon_option): Move to
+ * common/miscellaneous.c (obsolete_option): ... here.
+ * agent/gpg-agent.c (main): Use obsolete_option for the 3 obsolete
+ options.
+
+2015-06-16 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Cleanup zombies and fix hang on shutdown.
+ * dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Move nfds computation
+ into the loop. Check the queue also on timeout. Close log_fd and
+ reader context on EOF or error.
+
+ dirmngr: Avoid accessing uninitialized memory in log callback.
+ * dirmngr/dirmngr.c (pid_suffix_callback): Clear int_and_ptr_u before
+ use.
+ (start_connection_thread): Ditto.
+ (handle_connections): Ditto.
+
+2015-06-16 Neal H. Walfield <neal at g10code.com>
+
+ Don't prompt for the password multiple times in pinentry loopback mode.
+ * g10/gpg.c (main): If OPT.PINENTRY_MODE is PINENTRY_MODE_LOOPBACK,
+ clear OPT.PASSPHRASE_REPEAT.
+
+2015-06-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese Translation.
+
+2015-06-15 Werner Koch <wk at gnupg.org>
+
+ doc: Add defs.inc to BUILT_SOURCES.
+
+2015-06-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.5.
+
+ agent: Fix --extra-socket on Windows.
+ * agent/gpg-agent.c (start_connection_thread): Rename to ...
+ (do_start_connection_thread): this. Factor nonce checking out to ...
+ (start_connection_thread_std): this,
+ (start_connection_thread_extra): this,
+ (start_connection_thread_browser): and this.
+
+ agent: Add experimental option --browser-socket.
+ * agent/agent.h (opt): Add field "browser_socket".
+ * agent/command.c (cmd_setkeydesc): Use a different message for
+ restricted==2.
+ * agent/gpg-agent.c (oBrowserSocket): New.
+ (opts): Add --browser-socket.
+ (socket_name_browser, redir_socket_name_browser): New.
+ (socket_nonce_browser): New.
+ (cleanup): Cleanup browser socket.
+ (main): Implement option.
+ (start_connection_thread_browser): New.
+ (handle_connections): Add arg listen_fd_browser and use it.
+
+2015-06-10 Daiki Ueno <ueno at gnu.org>
+
+ agent: Add option --allow-emacs-pinentry.
+ * agent/agent.h (opt): Add field allow_emacs_pinentry.
+ * agent/call-pinentry.c (start_pinentry): Act upon new var.
+ * agent/gpg-agent.c (oAllowEmacsPinentry): New.
+ (opts): Add option --allow-emacs-pinentry.
+ (parse_rereadable_options): Set this option.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add new option.
+
+2015-06-09 Werner Koch <wk at gnupg.org>
+
+ doc: Do not used fixed file names in the manuals.
+ * doc/mkdefsinc.c: New.
+ * doc/Makefile.am: Include cmacros.am.
+ (EXTRA_DIST): Add mkdefsinc.c defsincdate.
+ (BUILT_SOURCES): Add defsincdate
+ (CLEANFILES): Add mkdefsinc and defs.inc.
+ (mkdefsinc): New rule.
+ (yat2m-stamp): Depend on defs.inc.
+ ($(myman_pages) gnupg.7): Ditto.
+ (gnupg.texi): Remove rule to touch itself.
+ (dist-hook): New.
+ (defsincdate): New.
+ (defs.inc): New.
+ * doc/gnupg.texi: Remove inclusion of version.texi. Include defs.inc.
+ Also include defs.inc in all files used to build man files. Change
+ fixed directory names to those from defs.inc.
+
+ dirmngr: Avoid crash due to an empty crls.d/DIR.txt.
+ * dirmngr/crlcache.c (check_dir_version): Avoid segv.
+
+2015-06-08 Werner Koch <wk at gnupg.org>
+
+ doc: Change the manual source to be only for GnuPG 2.1.
+
+ Convey envvar INSIDE_EMACS to the pinentry.
+ * common/session-env.c (stdenvnames): Add it.
+
+ agent: Add command "getinfo std_env_names".
+ * agent/command.c (cmd_getinfo): Add new sub-command.
+
+2015-06-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: do_decipher change for OpenPGPcard v3.0.
+ * scd/app-openpgp.c (do_decipher): Add a header for ECDH.
+
+2015-06-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Replace -1 by GPG_ERR_NOT_FOUND in tdbio.c.
+ * g10/tdbio.c (lookup_hashtable): Return GPG_ERR_NOT_FOUND.
+ * g10/tdbdump.c (import_ownertrust): Test for GPG_ERR_NOT_FOUND.
+ * g10/trustdb.c (read_trust_record): Ditto.
+ (tdb_get_ownertrust, tdb_get_min_ownertrust): Ditto.
+ (tdb_update_ownertrust, update_min_ownertrust): Ditto.
+ (tdb_clear_ownertrusts, update_validity): Ditto.
+ (tdb_cache_disabled_value): Ditto.
+
+ gpg: Cleanup error code path in case of a bad trustdb.
+ * g10/tdbio.c (tdbio_read_record): Fix returning of the error.
+
+ gpg: Fix output in case of a corrupted trustdb.
+ * g10/tdbdump.c (list_trustdb): Add arg FP and change callers to pass
+ es_stdout.
+ * g10/tdbio.c (upd_hashtable): On a corrupted trustdb call
+ list_trustdb only in verbose > 1 mode and let it dump to stderr.
+
+2015-05-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix key template of ECC.
+ * scd/app-openpgp.c (build_ecc_privkey_template): Use correct value.
+
+2015-05-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix a race condition initially creating trustdb.
+ * g10/tdbio.c (take_write_lock, release_write_lock): New.
+ (put_record_into_cache, tdbio_sync, tdbio_end_transaction): Use
+ new lock functions.
+ (tdbio_set_dbname): Fix the race.
+ (open_db): Don't call dotlock_create.
+
+2015-05-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Remove g10/signal.c.
+ * g10/signal.c: Remove.
+ * g10/main.h: Remove old function API.
+ * g10/tdbio.c: Use new API, even in the dead code.
+
+2015-05-20 Werner Koch <wk at gnupg.org>
+
+ agent: Cleanup caching code for command GET_PASSPHRASE.
+ * agent/command.c (cmd_get_passphrase): Read from the user cache.
+
+2015-05-19 Neal H. Walfield <neal at g10code.com>
+
+ agent: When the password cache is cleared, also clear the ext. cache.
+ * agent/agent.h (agent_clear_passphrase): New declaration.
+ * agent/call-pinentry.c (agent_clear_passphrase): New function.
+ * agent/command.c (cmd_clear_passphrase): Call agent_clear_passphrase.
+
+ agent: Modify agent_clear_passphrase to support an ext. password cache.
+ * agent/agent.h (agent_get_passphrase): Add arguments keyinfo and
+ cache_mode. Update callers.
+ * agent/call-pinentry.c (agent_get_passphrase): Add arguments keyinfo
+ and cache_mode. If KEYINFO and CACHE_MODE describe a cachable key,
+ then send SETKEYINFO to the pinentry.
+
+2015-05-19 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: detects public key encryption packet error properly.
+ g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for
+ encryption.
+
+2015-05-15 Werner Koch <wk at gnupg.org>
+
+ build: Make --disable-gpgsm work.
+ * Makefile.am: Always build kbx/
+ * g10/Makefile.am (AM_CFLAGS): Include KSBA_CFLAGS.
+
+2015-05-12 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.4.
+
+ speedo: Add make option SELFCHECK=0 to build a new release.
+ * build-aux/getswdb.sh: Add option --skip-selfcheck.
+ * build-aux/speedo.mk: Add option SELFCHECK.
+
+2015-05-11 Werner Koch <wk at gnupg.org>
+
+ common: Cope with AIX problem on number of open files.
+ * common/exechelp-posix.c: Limit returned value for too hight values.
+
+ gpg-connect-agent: Fix quoting of internal percent+ function.
+ * tools/gpg-connect-agent.c (get_var_ext) <percent, percent+): Also
+ escape '+'.
+
+ agent: Add option --no-allow-external-cache.
+ * agent/agent.h (opt): Add field allow_external_cache.
+ * agent/call-pinentry.c (start_pinentry): Act upon new var.
+ * agent/gpg-agent.c (oNoAllowExternalCache): New.
+ (opts): Add option --no-allow-external-cache.
+ (parse_rereadable_options): Set this option.
+
+ agent: Add strings for use by future Pinentry versions.
+ * agent/call-pinentry.c (start_pinentry): Add more strings.
+
+ agent: Add option --debug-pinentry.
+ * agent/gpg-agent.c (oDebugPinentry): New.
+ (opts): Add --debug-pinentry.
+ (parse_rereadable_options): Set that option.
+ * agent/call-pinentry.c (start_pinentry): Pass option to
+ assuan_set_flag.
+
+2015-05-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid cluttering stdout with trustdb info in verbose mode.
+ * g10/trustdb.c (validate_keys): Call dump_key_array only in debug
+ mode.
+
+ gpg: Fix wrong output in list mode.
+ * g10/parse-packet.c (parse_gpg_control): Replace puts by es_fputs to
+ LISTFP.
+
+ gpg: New command --quick-adduid.
+ * g10/keygen.c (ask_user_id): Factor some code out to ...
+ (uid_already_in_keyblock): new.
+ (generate_user_id): Add arg UIDSTR. Fix leaked P.
+ * g10/keyedit.c (menu_adduid): Add new arg uidstring. Adjust caller.
+ (keyedit_quick_adduid): New.
+ * g10/gpg.c (aQuickAddUid): New.
+ (opts): Add command --quick-adduid.
+ (main): Implement that.
+
+ gpg: Add push/pop found state feature to keydb.
+ * g10/keydb.c (keydb_handle): Add field saved_found.
+ (keydb_new): Init new field.
+ (keydb_push_found_state, keydb_pop_found_state): New.
+ * g10/keyring.c (kyring_handle): Add field saved_found.
+ (keyring_push_found_state, keyring_pop_found_state): New.
+
+ gpg: Minor code merging in keyedit.
+ * g10/keyedit.c (fix_keyblock): Rename to fix_key_signature_order.
+ (fix_keyblock): New. Call fix_key_signature_order and other fix
+ functions.
+ (keyedit_menu): Factor code out to new fix_keyblock.
+ (keyedit_quick_sign): Ditto. Check for primary fpr before calling
+ fix_keyblock.
+
+2015-05-07 Werner Koch <wk at gnupg.org>
+
+ agent: Minor change for 56b5c9f.
+ * agent/call-pinentry.c (agent_askpin): Move option setting to ...
+ (start_pinentry): here. Fix error code check.
+
+2015-05-07 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ dirmngr: Fix segfault in ldap engine.
+ (ks-engine-ldap.c) Fix segfault caused by missing check whether uri is
+ initialized
+
+2015-05-07 Neal H. Walfield <neal at g10code.com>
+
+ agent: Improve support for externally cached passwords.
+ * agent/call-pinentry.c (PINENTRY_STATUS_PASSWORD_FROM_CACHE): New
+ constant.
+ (pinentry_status_cb): Add it to *FLAGS if PASSWORD_FROM_CACHE was
+ provided.
+ (agent_askpin): Pass "OPTION allow-external-password-cache" to the
+ pinentry. Always pass SETKEYINFO to the pinentry. If there is no
+ stable identifier, then use "--clear". If the password is incorrect
+ and PINENTRY_STATUS_PASSWORD_FROM_CACHE is set in *PINENTRY_STATUS,
+ then decrement PININFO->FAILED_TRIES.
+
+ agent: Or in the value; don't overwrite the variable.
+ * agent/call-pinentry.c (pinentry_status_cb): Or in
+ PINENTRY_STATUS_CLOSE_BUTTON; don't overwrite *FLAG.
+
+ agent: Avoid magic numbers. Use more accurate names.
+ * agent/call-pinentry.c (PINENTRY_STATUS_CLOSE_BUTTON): New constant.
+ (PINENTRY_STATUS_PIN_REPEATED): Likewise.
+ (close_button_status_cb): Rename from this...
+ (pinentry_status_cb): ... to this. Use the constants.
+ (agent_askpin): Rename local variable from close_button to
+ pinentry_status. Use symbolic constants rather than magic numbers.
+
+2015-05-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve 'General key info' line of --card-status.
+ * g10/keylist.c (print_pubkey_info): Print either "pub" or "sub".
+
+ * g10/getkey.c (get_pubkey_byfprint): Add optional arg R_KEYBLOCK.
+ * g10/keyid.c (keyid_from_fingerprint): Adjust for change.
+ * g10/revoke.c (gen_desig_revoke): Adjust for change.
+ * g10/card-util.c (card_status): Simplify by using new arg. Align
+ card-no string.
+
+ * g10/card-util.c (card_status): Remove not used GnuPG-1 code.
+
+ gpg: Fix regression not displaying the card serial number.
+ * g10/call-agent.c (keyinfo_status_cb): Detect KEYINFO.
+
+2015-05-06 Werner Koch <wk at gnupg.org>
+
+ speedo,w32: Install a native pinentry.
+ * build-aux/speedo.mk: Always build pinentry for w32.
+ (speedo_pkg_pinentry_configure): Adjust to modern pinentry.
+ * build-aux/speedo/w32/inst.nsi: Install native pinentry under the
+ name pinentry-basic.exe.
+
+2015-05-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: fix cmp_public_key.
+ * g10/free-packet.c (cmp_public_keys): Compare opaque
+ data at the first entry of the array when it's unknown algo.
+
+2015-04-30 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC reader selection by partial string match.
+ * scd/apdu.c (open_pcsc_reader_direct): Partial string match.
+
+2015-04-24 Werner Koch <wk at gnupg.org>
+
+ common: Remove JNLIB from boiler plate (jnlib merge).
+ * common/README.jnlib: Remove.
+
+ common: Rename log and gcc attribute macros (jnlib merge).
+ * common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*.
+ * common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*.
+
+ common: Remove two JNLIB_ macros (jnlib merge).
+ * configure.ac: Merge seperate jnlib checks.
+ (HAVE_JNLIB_LOGGING): Remove.
+ * common/logging.c, common/simple-pwquery.c (JNLIB_NEED_AFLOCAL):
+ Rename to GNUPG_COMMON_NEED_AFLOCAL. Change all tests.
+
+ common: Remove libjnlib-config.h (jnlib merge).
+ * common/libjnlib-config.h: Remove.
+ * common/common-defs.h (getenv) [HAVE_GETENV]: New. From removed
+ header.
+ (getpid) [HAVE_W32CE_SYSTEM]: New. From removed header.
+ * common/argparse.c: Include util.h and common-defs.h. Replace
+ jnlib_ macro names for non-GNUPG builds by x* names.
+ * common/dotlock.c: Ditto.
+ * common/logging.c: Include util.h and common-defs.h. Replace jnlib_
+ symbol names by x* names.
+ * common/strlist.c: Ditto.
+ * common/utf8conv.c: Ditto.
+ * common/w32-reg.c: Ditto.
+ * common/mischelp.c: Ditto. Also remove _jnlib_free.
+ * common/stringhelp.c: Ditto.
+ (JNLIB_LOG_WITH_PREFIX): Do not depend on this macro.
+ * common/logging.h (JNLIB_LOG_WITH_PREFIX): Do not depend on this
+ macro.
+
+2015-04-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Move all DNS access to Dirmngr.
+ * common/dns-cert.h: Move to ../dirmngr/.
+ * common/dns-cert.c: Move to ../dirmngr/. Change args to return the
+ key as a buffer.
+ * common/t-dns-cert.c: Move to ../dirmngr/.
+ * common/pka.c, common/pka.h, common/t-pka.c: Remove.
+
+ * dirmngr/server.c (data_line_cookie_write): Factor code out to
+ data_line_write and make it a wrapper for that.
+ (data_line_write): New.
+ (cmd_dns_cert): New.
+ (register_commands): Register new command.
+
+ * g10/Makefile.am (LDADD): Remove DNSLIBS.
+ * g10/call-dirmngr.c (dns_cert_parm_s): New.
+ (dns_cert_data_cb, dns_cert_status_cb): New.
+ (gpg_dirmngr_dns_cert): New.
+ (gpg_dirmngr_get_pka): New.
+ * g10/gpgv.c (gpg_dirmngr_get_pka): New dummy function.
+ * g10/keyserver.c (keyserver_import_cert): Replace get_dns_cert by
+ gpg_dirmngr_dns_cert.
+ (keyserver_import_pka): Replace get_pka_info by gpg_dirmngr_get_pka.
+ * g10/mainproc.c: Include call-dirmngr.h.
+ (pka_uri_from_sig): Add CTX arg. Replace get_pka_info by
+ gpg_dirmngr_get_pka.
+
+ common: Minor change of hex2str to allow for embedded nul.
+ * common/convert.c (hex2str): Set ERRNO. Return adjusted COUNT.
+
+2015-04-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ common: removal of t-support.c from t_jnlib_src.
+ * common/Makefile.am (t_jnlib_src): Remove t-support.c.
+
+2015-04-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Make keyserver-option http_proxy work.
+ * g10/options.h (opt): Add field keyserver_options.http_proxy.
+ * g10/keyserver.c (warn_kshelper_option): Add arg noisy.
+ (parse_keyserver_options): Parse into new http_proxy field.
+ * g10/call-dirmngr.c (create_context): Send the http-proxy option.
+
+ common: Make proper use of http proxy parameter.
+ * common/http.c (is_hostname_port): New.
+ (send_request): Fix proxy name parsing.
+
+ dirmngr: Add http proxy support for keyservers.
+ * dirmngr/dirmngr.h (server_control_s): Add field http_proxy.
+ * dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Copy http_proxy value
+ from OPT.
+ (dirmngr_deinit_default_ctrl): New.
+ (main): Call dirmngr_deinit_default_ctrl.
+ * dirmngr/server.c (start_command_handler): Ditto.
+ (option_handler): Add option "http-proxy".
+ * dirmngr/crlfetch.c (crl_fetch): Take http_proxy from CTRL.
+ * dirmngr/ocsp.c (do_ocsp_request): Ditto.
+ * dirmngr/ks-engine-hkp.c (send_request): Add proxy support.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+
+ gpg: Do not use honor-keyserver-url sub-option by default.
+
+ gpg: Make preferred keyservers work.
+ * g10/call-dirmngr.c (dirmngr_local_s): Add field set_keyservers_done.
+ (create_context): Move keyserver setting to ...
+ (open_context): here.
+ (clear_context_flags): New.
+ (gpg_dirmngr_ks_get): Add arg override_keyserver.
+ * g10/keyserver.c (keyserver_refresh): Improve diagnostics.
+ (keyserver_get_chunk): Ditto. Pass OVERRIDE_KEYSERVER to ks_get.
+
+ gpg: Update sub-options of --keyserver-options.
+ * g10/options.h (KEYSERVER_HTTP_PROXY): New.
+ (KEYSERVER_USE_TEMP_FILES, KEYSERVER_KEEP_TEMP_FILES): Remove.
+ (KEYSERVER_TIMEOUT): New.
+ * common/keyserver.h (KEYSERVER_TIMEOUT): Remove.
+ * g10/keyserver.c (keyserver_opts): Remove obsolete "use-temp-files"
+ and "keep-temp-files". Add "http-proxy" and "timeout".
+ (parse_keyserver_options): Remove 1.2 compatibility option
+ "honor-http_proxy". Remove "use-temp-files" and "keep-temp-files"
+ code.
+
+2015-04-14 Werner Koch <wk at gnupg.org>
+
+ agent: Send the new SETKEYINFO command to the Pinentry.
+ * agent/call-pinentry.c (agent_askpin): Add args keyinfo and
+ cache_mode. Change all callers to pass (NULL,0) for them. Send
+ SETKEYINFO command.
+ * agent/findkey.c (unprotect): Pass the keygrip and the cache_mode for
+ the new args.
+
+2015-04-14 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: better handling of extended APDU.
+ * scd/apdu.c (send_le): Bug fix for not append Z when lc<0&&le<0.
+ * scd/app-common.h (struct app_ctx_s): Use bit fields for flags.
+ * scd/ccid-driver.c (CCID_MAX_BUF): New. Only for OpenPGPcard.
+ (struct ccid_driver_s): New field of max_ccid_msglen.
+ Remove ifsd field.
+ (parse_ccid_descriptor): Initialize max_ccid_msglen.
+ (ccid_transceive_apdu_level): Implement sending extended APDU in
+ chain of CCID message.
+
+2015-04-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix NULL-segv due to invalid imported data.
+ * g10/free-packet.c (my_mpi_copy): New.
+ (copy_public_key, copy_signature): Use instead of mpi_copy.
+
+2015-04-13 Neal H. Walfield <neal at g10code.com>
+
+ dirmngr: If LDAP is not enable, don't build the LDAP bits.
+ * dirmngr/Makefile.am (dirmngr_SOURCES): Only include
+ ks-engine-ldap.c, ldap-parse-uri.c and ldap-parse-uri.h if USE_LDAP
+ is TRUE.
+ (module_tests): Only add t-ldap-parse-uri if USE_LDAP is TRUE.
+ * dirmngr/ks-action.c: Only include "ldap-parse-uri.h" if USE_LDAP is
+ TRUE.
+ (ks_action_help): Don't invoke LDAP functionality if USE_LDAP is not
+ TRUE.
+ (ks_action_search): Likewise.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise.
+ * dirmngr/server.c: Only include "ldap-parse-uri.h" if USE_LDAP is
+ TRUE.
+ (cmd_keyserver): Don't invoke LDAP functionality if USE_LDAP is not
+ TRUE.
+
+2015-04-13 Werner Koch <wk at gnupg.org>
+
+ common: Do without nested fucntions to support non-gcc.
+ * common/t-stringhelp.c (test_strsplit): Remove nested function.
+
+2015-04-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.3.
+
+2015-04-11 Yuri Chornoivan <yurchor at ukr.net>
+
+ po: Update Ukrainian translation.
+
+2015-04-11 Ineiev <ineiev at gnu.org>
+
+ po: Update and review Russian translation.
+
+2015-04-10 Werner Koch <wk at gnupg.org>
+
+ dirmngr,w32: Make it build for Windows.
+ * dirmngr/Makefile.am (t_common_ldadd): Add missing libs.
+
+ Remove obsolete directories from AM_CPPFLAGS.
+
+ dirmngr,w32: Replace functions not available under Windows.
+ * dirmngr/ks-engine-ldap.c (extract_attributes): Replace isoptime and
+ gmtime_r.
+
+ common: Add new function gnupg_gmtime.
+ * common/gettime.c (gnupg_gmtime): New.
+ (gnupg_get_isotime): Use it. Also take care of an gmtime_t returning
+ an error.
+
+ common: Add new function isodate_human_to_tm.
+ * common/gettime.c (isotime_human_p): Add arg date_only.
+ (isodate_human_to_tm): New.
+ * common/t-gettime.c (test_isodate_human_to_tm): New.
+ (main): Call new test.
+
+ dirmngr,w32: Avoid name clash with existing function.
+ * dirmngr/ks-engine-ldap.c (ldap_connect): Rename to my_ldap_connect.
+
+ gpgparsemail: Fix last commit (3f2bdac)
+ * tools/rfc822parse.c (parse_field): Replace break by goto.
+
+2015-04-09 Werner Koch <wk at gnupg.org>
+
+ gpgparsemail: Fix case of zero length continuation lines.
+ * tools/rfc822parse.c (parse_field): Loop after continuation line.
+
+2015-04-08 Werner Koch <wk at gnupg.org>
+
+ sm: Fix certificate lookup in dirmngr cache.
+ * sm/call-dirmngr.c (get_cached_cert): Fix typo in LOOKUP command.
+
+2015-04-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Print the user id in --fast-list-mode.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Change.
+
+ gpg: Prepare to pass additional context to the list functions.
+ * g10/keylist.c (struct sig_stats): Rename to keylist_context and add
+ field check_sigs.
+ (keylist_context_release): New.
+ (list_all): Set listctx.check_sigs and call release func.
+ (list_one): Ditto.
+ (locate_one): Ditto.
+ (list_keyblock_print): Use .check_sigs field. Repalce arg opaque by
+ listctx.
+ (list_keyblock): Ditto. Make static.
+ (list_keyblock_direct): New.
+ * g10/keygen.c (do_generate_keypair): Replace list_keyblock by
+ list_keyblock_direct.
+
+ gpg: Merge duplicated code for get_user_id et al.
+ * g10/getkey.c (get_user_id_string): Add args mode and r_LEN.
+ (get_user_id_string_native): Add new args.
+ (get_long_user_id_string, get_user_id): Rewrite using
+ get_user_id_string.
+
+ gpg: Add new option --debug-iolbf.
+ * g10/gpg.c (oDebugIOLBF): new.
+ (opts): Add --debug-iolbf.
+ (main): Set option.
+
+ Rename DBG_ASSUAN to DBG_IPC and add separate DBG_EXTPROG.
+ * g10/options.h (DBG_EXTPROG_VALUE): Separate from DBG_IPC_VALUE.
+
+ Fix use of DBG_CACHE and DBG_LOOKUP.
+ * dirmngr/dirmngr.h (DBG_LOOKUP_VALUE): Change to 8192.
+ * g10/options.h (DBG_LOOKUP_VALUE, DBG_LOOKUP): New.
+ * g10/getkey.c: Use DBG_LOOKUP instead of DBG_CACHE at most places.
+
+ gpg: Rename a debug macro.
+ * g10/options.h (DBG_CIPHER_VALUE): Rename to DBG_CRYPTO_VALUE.
+ (DBG_CIPHER): Rename to DBG_CRYPTO.
+
+2015-04-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix DoS while parsing mangled secret key packets.
+ * g10/parse-packet.c (parse_key): Check PKTLEN before calling mpi_read
+ et al.
+
+2015-04-03 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix keytocard.
+ g10/call-agent.h (agent_scd_learn): Add FORCE option.
+ g10/call-agent.c (agent_scd_learn): Implement FORCE option.
+ g10/keygen.c (gen_card_key): Follow the change of option.
+ g10/card-util.c (change_pin, card_status, factory_reset): Likewise.
+ g10/keyedit.c (keyedit_menu): Update private key storage by
+ agent_scd_learn.
+
+ agent: Add --force option for LEARN.
+ * agent/command.c (cmd_learn): Handle --force option.
+ (cmd_keytocard): Don't update key storage file.
+ * agent/agent.h (agent_handle_learn): Add FORCE.
+ * agent/learncard.c (agent_handle_learn): Implement FORCE to update
+ key stroage file.
+
+2015-03-31 Neal H. Walfield <neal at g10code.com>
+
+ dirmngr: Don't use alloca.
+ * dirmngr/ks-engine-ldap.c (ks_ldap_put): Replace use of alloca with
+ xmalloc and xfree.
+
+ dirmngr: Simplify truncation of long strings in debug code.
+ * dirmngr/ks-engine-ldap.c (modlist_dump): Simplify truncation of long
+ strings.
+
+ dirmngr: Use a better error code.
+ * dirmngr/ldap-parse-uri.c (ldap_parse_uri): On error, return
+ GPG_ERR_GENERAL, not GPG_ERR_ASS_GENERAL.
+
+ dirmngr: Better encapsulate the keyservers variable.
+ * dirmngr/dirmngr.h (struct server_control_s): Move field keyservers
+ from here...
+ * dirmngr/server.c (struct server_local_s): ... to here. Update
+ users.
+ * dirmngr/ks-action.h (ks_action_resolve): Add argument keyservers.
+ (ks_action_search): Likewise.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise.
+ * dirmngr/ks-action.c (ks_action_resolve): Add argument keyservers.
+ Use it instead of ctrl->keyservers.
+ (ks_action_search): Likewise.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise.
+
+2015-03-28 Neal H. Walfield <neal at g10code.de>
+
+ gpg: Only use the last specified keyserver.
+ * g10/gpg.c (main): Only use the last specified keyserver.
+
+2015-03-25 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix resource leaks and check rare errors.
+ * dirmngr/ks-engine-ldap.c (keyspec_to_ldap_filter): Fix resource
+ leak.
+ (ks_ldap_search): Check error from es_fopenmem. Use LDAP_ERR where
+ required.
+ (modlist_dump): Check error from es_fopenmem.
+ (uncescape): s/int/size_t/. Use existing macros.
+ (extract_attributes): Use existing trim function.
+ (ks_ldap_put): Do not segv on error from modlist_dump.
+
+ dirmngr: Minor cleanups.
+ * dirmngr/ks-engine-ldap.c [__riscos__]: Remove doubled util.h.
+ (ldap_to_gpg_err): s/GPG_ERR_GENERAL/GPG_ERR_INTERNAL/.
+ (tm2ldaptime): Use snprintf.
+ (ldap_connect): Get error code prior to log_error and and use modern
+ function. Use xfree, xtrustrdup etc.
+ (modlist_lookup): Use GNUPG_GCC_A_USED.
+ (modlist_free): Use xfree.
+
+ common: Add macro GNUPG_GCC_A_USED.
+ * common/util.h (GNUPG_GCC_A_USED): New.
+
+ sm: Change default algos to SHA256 (CSR) and AES128 (bulk encryption).
+ * sm/certreqgen.c (create_request): Change default hash algo.
+ * sm/gpgsm.c (DEFAULT_CIPHER_ALGO): Change default bulk cipher algo.
+
+2015-03-24 Werner Koch <wk at gnupg.org>
+
+ gpg,w32: Handle forward slash in --keyring option.
+ * g10/keydb.c (keydb_add_resource): Allow forward slash under Windows.
+
+2015-03-23 Neal H. Walfield <neal at g10code.de>
+
+ Improve documentation for ks_hkp_get.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_get): Improvement documentation.
+
+ Improve documenation of http_parse_uri.
+ * common/http.c (http_parse_uri): Improve documentation.
+
+ Add support to talking to LDAP key servers.
+ * g10/call-dirmngr.c (record_output): New function.
+ (ks_put_inq_cb): Use it here to generate a --with-colons like output
+ instead of a custom format.
+ * dirmngr/ks-action.c: Include "ldap-parse-uri.h".
+ (ks_action_help): If the provided URI is an LDAP URI, then use
+ ldap_parse_uri to parse. Call ks_ldap_help.
+ (ks_action_search): If passed an LDAP URI, then call ks_ldap_search.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise. Also, change data from a 'const void *' to
+ a 'void *' and add info and infolen parameters. Add note that
+ function may modify DATA.
+ * dirmngr/ks-action.h (ks_action_put): Update declaration accordingly.
+ * dirmngr/server.c: Include "ldap-parse-uri.h".
+ (cmd_keyserver): If ITEM->URI is an LDAP URI, parse it using
+ ldap_parse_uri.
+ (hlp_ks_put): Improve documentation.
+ (cmd_ks_put): Also pass info and infolen to ks_action_put. Improve
+ documentation.
+ * dirmngr/ks-engine.h (ks_ldap_help): New declaration.
+ (ks_ldap_search): Likewise.
+ (ks_ldap_get): Likewise.
+ (ks_ldap_put): Likewise.
+ * dirmngr/ks-engine-ldap.c: New file.
+ * dirmngr/Makefile.am (dirmngr_SOURCES): Add ks-engine-ldap.c,
+ ldap-parse-uri.c and ldap-parse-uri.h.
+ (dirmngr_LDADD) [USE_LDAP]: Add $(ldaplibs).
+
+ Import _gpgme_parse_timestamp from gpgme as parse_timestamp.
+ * common/gettime.h (parse_timestamp): New declaration.
+ * common/gettime.c (_win32_timegm): New function imported from
+ gpgme/src/conversion.c:_gpgme_timegm.
+ (parse_timestamp): New function imported from
+ gpgme/src/conversion.c:_gpgme_parse_timestamp.
+
+ Move copy_stream function to misc.c.
+ * dirmngr/ks-action.c (copy_stream): Move function from here...
+ * dirmngr/misc.c (copy_stream): ... to here and drop the static
+ qualifier.
+ * dirmngr/misc.h (copy_stream): Add declaration.
+
+ Move armor_data to misc.c.
+ * dirmngr/ks-engine-hkp.c (armor_data): Move function from here...
+ * dirmngr/misc.c (armor_data): ... to here and drop static qualifier.
+ * dirmngr/misc.h: New declaration.
+
+ Add new LDAP utility functions.
+ * dirmngr/Makefile.am (module_tests): New variable.
+ (noinst_PROGRAMS): New primary. Set it to $(module_tests).
+ (TESTS): New variable. Set it to $(module_tests).
+ (t_common_src): New variable.
+ (t_common_ldadd): Likewise.
+ (t_ldap_parse_uri_SOURCES): New primary.
+ (t_ldap_parse_uri_LDADD): Likewise.
+ * dirmngr/ldap-parse-uri.c: New file.
+ * dirmngr/ldap-parse-uri.h: Likewise.
+ * dirmngr/t-ldap-parse-uri.c: Likewise.
+ * dirmngr/t-support.h: Likewise.
+
+ Add new function uri_query_lookup.
+ * common/http.h (uri_query_lookup): New declaration.
+ * common/http.c (uri_query_lookup): The corresponding implementation.
+
+ Add new function strlist_find.
+ * common/strlist.h (strlist_find): New declaration.
+ * common/strlist.c (strlist_find): New function.
+
+ common: Add new helper function, strsplit.
+ * common/stringhelp.h (strsplit): New declaration.
+ * common/stringhelp.c (strsplit): New function.
+ * common/t-stringhelp.c (test_strsplit): New function.
+ (main): Call it here.
+
+2015-03-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Consider a mailbox only userid in mail search mode.
+ * kbx/keybox-search.c: Include mbox-util.h.
+ (blob_cmp_mail): Improve OpenPGP uid parsing.
+
+ common: Add function is_valid_mailbox_mem.
+ * common/mbox-util.c (mem_count_chr): New.
+ (my_memstr): New.
+ (has_invalid_email_chars): Change args to work on a buffer.
+ (is_valid_mailbox_mem): New.
+ (is_valid_mailbox): Rewrite to use is_valid_mailbox_mem.
+
+ gpg: Find keys using mail addresses with garbage after the '>'
+ * kbx/keybox-search.c (blob_cmp_mail): Stop comparing at the '>'.
+
+ common: Fix syntax error when building with gnutls.
+ * common/http.c (send_request): Add missing comma.
+
+2015-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Emit status line NEWSIG before signature verification starts.
+ * g10/mainproc.c (check_sig_and_print): Emit STATUS_NEWSIG.
+
+ agent: Compute correct MPI length header for protected ECC keys.
+ * agent/cvt-openpgp.c (apply_protection): Strip leading zeroes from
+ opaque MPIs to comply with the OpenPGP spec.
+
+ hkps: Fix host name verification when using pools.
+ * common/http.c (send_request): Set the requested for SNI.
+ * dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
+ the selecting a host.
+
+ Define replacement error codes from libgpg-error 1.19.
+ * common/util.h: Add GPG_ERR_LDAP codes for libgpg-error < 1.19.
+
+2015-03-17 Andre Heinecke <aheinecke at intevation.de>
+
+ gpgtar: Fix extracting files with !(size % 512)
+ * tools/gpgtar-extract.c (extract_regular): Handle size multiples
+ of RECORDSIZE.
+
+2015-03-17 Werner Koch <wk at gnupg.org>
+
+ common: Add feature to ease using argparse's usage().
+ * common/argparse.c (show_help): Take care of flag value
+ (usage): Ditto.
+
+ common: Allow standalone build of argparse.c.
+ * common/argparse.h: Remove types.h - not required.
+ * common/argparse.c: Change to allow standalone use.
+
+2015-03-16 Werner Koch <wk at gnupg.org>
+
+ gpg: Create all MPIs with RFC-4880 correct length headers.
+ * g10/build-packet.c (gpg_mpi_write): Strip leading zeroes.
+
+ gpg: Allow printing of MPI values in --list-mode.
+ * g10/parse-packet.c (set_packet_list_mode): Set mpi_print_mode.
+ * g10/misc.c (mpi_print): Do not print an extra leading zero.
+
+ gpg: Fix broken write of opaque MPI length header.
+ * g10/build-packet.c (gpg_mpi_write): Use a char array for the length.
+
+2015-03-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix possible dead code elimination.
+ * g10/encrypt.c: Change condition for detecting a real file.
+
+ g13: Fix pointer wrap check.
+ * g13/utils.c (find_tuple, next_tuple): Cast pointer to size_t before
+ doing an overflow check.
+
+ agent: Remove useless conditions in command.c.
+ * agent/command.c (cmd_setkeydesc): Remove NULL check.
+ (cmd_get_passphrase): Ditto.
+ (cmd_clear_passphrase): Ditto.
+ (cmd_get_confirmation): Ditto.
+ (cmd_getval): Ditto.
+ (cmd_putval): Ditto.
+
+ agent: Fix length test in sshcontrol parser.
+ * agent/command-ssh.c (ssh_search_control_file): Check S before
+ upcasing it.
+
+ agent: Remove useless conditions.
+ * agent/genkey.c (agent_ask_new_passphrase): Remove useless condition.
+ * agent/command-ssh.c (ssh_identity_register): Ditto.
+
+ gpg: Remove useless condition.
+ * g10/keylist.c (list_keyblock_colon): Remove useless condition (PK).
+ (list_keyblock_print): Likewise.
+
+ scd: Fix possible NULL deref in apdu.c.
+ * scd/apdu.c (control_pcsc_direct): Take care of BUFLEN being NULL.
+ (control_pcsc_wrapped): Ditto.
+
+ common: Make openpgp_oid_to_str more robust.
+ * common/openpgp-oid.c (openpgp_oid_to_str): Take care of
+ gcry_mpi_get_opaque returning NULL. Remove useless condition !BUF.
+
+2015-03-11 Werner Koch <wk at gnupg.org>
+
+ agent: Improve error reporting from Pinentry.
+ * agent/call-pinentry.c (unlock_pinentry): Add error logging. Map
+ error source of uncommon errors to Pinentry.
+
+2015-03-10 Werner Koch <wk at gnupg.org>
+
+ gpg: Change --print-pka-records into an option.
+ * g10/gpg.c (aPrintPKARecords): Rename to oPrintPKARecords and do not
+ use it as a command.
+ * g10/keylist.c (list_keyblock): List PKA rceords also for secret
+ keys.
+
+ gpg: Add --list-gcrypt-config and "curve" item for --list-config.
+ * common/openpgp-oid.c (curve_supported_p): New.
+ (openpgp_enum_curves): New.
+ * common/t-openpgp-oid.c (test_openpgp_enum_curves): New.
+ (main): Add option --verbose.
+ * g10/gpg.c (opts): Add --list-gcrypt-config.
+ (list_config): Add items "curve" and "curveoid". Remove unused code.
+
+2015-03-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: fix for 64-bit arch.
+ * agent/pksign.c (agent_pksign_do): Use int.
+ * scd/app-openpgp.c (get_public_key): Likewise.
+
+2015-03-04 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: avoid chatter about trustdb when --quiet.
+ * g10/trustdb.c (tdb_check_trustdb_stale): avoid log_info() when
+ opt.quiet
+
+2015-02-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Lowercase mailbox for PKA lookups.
+ * common/stringhelp.c (ascii_strlwr): New.
+ * common/mbox-util.c (mailbox_from_userid): Downcase result.
+
+ gpg: Fix memory leak due to PKA lookup.
+ * g10/keyserver.c (keyserver_import_pka): Move the xfree.
+
+2015-02-25 Werner Koch <wk at gnupg.org>
+
+ gpg: Switch to a hash and CERT record based PKA system.
+ * common/dns-cert.c (get_dns_cert): Make r_key optional.
+ * common/pka.c: Rewrite for the new hash based lookup.
+ * common/t-pka.c: New.
+ * configure.ac: Remove option --disable-dns-pka.
+ (USE_DNS_PKA): Remove ac_define.
+ * g10/getkey.c (parse_auto_key_locate): Always include PKA.
+
+ common: Allow requesting a specific certtype with get_dns_cert()
+ * common/dns-cert.c (get_dns_cert): Add arg want_certtype. Change all
+ callers.
+ (CERTTYPE_): Move constants to ...
+ * common/dns-cert.h: here as DNS_CERTTYPE_.
+
+ Move new mailbox.c source file to common/.
+ * g10/mailbox.c: Move to ...
+ * common/mbox-util.c: new file.
+ * common/mbox-util.h: New. Include where needed.
+ * g10/t-mailbox.c: Move to ...
+ * common/t-mbox-util.c: new file.
+
+2015-02-24 Werner Koch <wk at gnupg.org>
+
+ gpg: Add command --print-pka-records.
+ * g10/gpg.c (main): Add command --print-pka-records.
+ * g10/options.h (struct opt): Add field "print_pka_records".
+ * g10/keylist.c (list_keyblock_pka): New.
+ (list_keyblock): Call it if new option is set.
+ (print_fingerprint): Add mode 10.
+
+ gpg: Add function to extract the mailbox.
+ * g10/misc.c (has_invalid_email_chars, is_valid_mailbox)
+ (is_valid_user_id): Move to ...
+ * g10/mailbox.c: new file.
+ (string_has_ctrl_or_space, has_dotdot_after_at): New.
+ (has_invalid_email_chars): New.
+
+ * g10/t-mailbox.c: New.
+ * g10/Makefile.am (module_tests): Add t-mailbox.
+ (t_mailbox_SOURCES, t_mailbox_LDADD): New.
+
+2015-02-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Add option to print fingerprints in ICAO spelling.
+ * g10/gpg.c: Add option --with-icao-spelling.
+ * g10/options.h (struct opt): Add with_icao_spelling.
+ * g10/keylist.c (print_icao_hexdigit): New.
+ (print_fingerprint): Print ICAO spelling.
+
+ gpg: Skip legacy keys while searching keyrings.
+ * g10/getkey.c (search_modes_are_fingerprint): New.
+ (lookup): Skip over legacy keys.
+
+ common: Fix regression due to commit 2183683b.
+ * common/dns-cert.c (get_dns_cert): Remove cruft.
+
+2015-02-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Replace remaining uses of stdio by estream.
+ * g10/sign.c (sign_file): Use log_printf instead of stderr.
+ * g10/tdbdump.c (export_ownertrust): Use estream fucntions.
+ (import_ownertrust): Ditto.
+ * g10/tdbio.c (tdbio_dump_record): Ditto. Change arg to estream_t.
+
+ gpg: Fix segv due to NULL value stored as opaque MPI.
+ * g10/build-packet.c (gpg_mpi_write): Check for NULL return from
+ gcry_mpi_get_opaque.
+ (gpg_mpi_write_nohdr, do_key): Ditto.
+ * g10/keyid.c (hash_public_key): Ditto.
+
+2015-02-12 Werner Koch <wk at gnupg.org>
+
+ scd: Fix regression in 2.1.2 (due to commit 2183683)
+ * scd/apdu.c (pcsc_vendor_specific_init): Replace use of
+ bufNN_to_uint by direct code.
+
+2015-02-12 Andre Heinecke <aheinecke at intevation.de>
+
+ dirmngr: Initialize cache from sysconfig dir.
+ * dirmngr/certcache.c (cert_cache_init): Load certificates
+ from sysconfig dir instead of the homeidr.
+ * dirmngr/dirmngr.c (main): Removed parsing of obsolete
+ homedir_data option.
+ * dirmngr/dirmngr.h (opt): Removed homedir_data.
+ * doc/dirmngr.texi: Update and clarify certs directory doc.
+
+2015-02-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.2.
+
+ dirmngr: Avoid warning about unused function.
+ * dirmngr/dirmngr.c (my_gnutls_log): Build only if gnutls is used.
+
+ build: Update standard build-aux files.
+
+ Use inline functions to convert buffer data to scalars.
+ * common/host2net.h (buf16_to_ulong, buf16_to_uint): New.
+ (buf16_to_ushort, buf16_to_u16): New.
+ (buf32_to_size_t, buf32_to_ulong, buf32_to_uint, buf32_to_u32): New.
+
+2015-02-09 Werner Koch <wk at gnupg.org>
+
+ gpg: Prevent an invalid memory read using a garbled keyring.
+ * g10/keyring.c (keyring_get_keyblock): Whitelist allowed packet
+ types.
+ * g10/keydb.c (parse_keyblock_image): Ditto.
+
+ gpg: Fix a NULL-deref in export due to invalid packet lengths.
+ * g10/build-packet.c (write_fake_data): Take care of a NULL stored as
+ opaque MPI.
+
+ gpg: Fix a NULL-deref due to empty ring trust packets.
+ * g10/parse-packet.c (parse_trust): Always allocate a packet.
+
+2015-02-04 Werner Koch <wk at gnupg.org>
+
+ gpg-agent: Use "pinentry-basic" as fallback.
+ * common/homedir.c (get_default_pinentry_name): New.
+ (gnupg_module_name): Use that for the default pinentry.
+ (gnupg_module_name_flush_some): New.
+ * agent/gpg-agent.c (agent_sighup_action): Flush some module names.
+ * agent/call-pinentry.c (start_pinentry): Do not modify
+ opt.pinentry_program.
+
+ w32: Add manifest to gpg.
+ * g10/gpg.w32-manifest.in: New.
+ * g10/gpg-w32info.rc: Add manifest.
+ * g10/Makefile.am (EXTRA_DIST): Add manifest.
+ (gpg-w32info.o): Depend on manifest.
+ * configure.ac (BUILD_VERSION): New.
+ (AC_CONFIG_FILES): Add manifest.
+
+2015-02-03 Werner Koch <wk at gnupg.org>
+
+ Update copyright years.
+ * common/w32info-rc.h.in (W32INFO_COMPANYNAME): Change to "The GnuPG
+ Project".
+
+2015-02-02 Werner Koch <wk at gnupg.org>
+
+ w32: Change default Windows install dir and add bin to PATH.
+ * build-aux/speedo.mk (WITH_GUI): New macro. The Windows installer is
+ now build by default without any GUI stuff.
+ * build-aux/speedo/w32/inst.nsi: Change standard installation
+ directory.
+ (AddToPath, un.RemoveFromPath): New.
+ (gnupginst): Add bin directory to the PATH.
+
+2015-02-01 Werner Koch <wk at gnupg.org>
+
+ w32: Allow for Unicocde installation directory.
+ * common/homedir.c (w32_rootdir): Use Unicode fucntion not only for
+ WinCE.
+
+2015-01-30 Joshua Rogers <git at internot.info>
+
+ kbx: Fix resource leak.
+ * kbx/keybox-update.c (blob_filecopy): Fix resource leak. On error
+ return, 'fp' and 'newfp' was never closed.
+
+2015-01-29 Werner Koch <wk at gnupg.org>
+
+ agent: Fix use of imported but unprotected openpgp keys.
+ * agent/agent.h (PRIVATE_KEY_OPENPGP_NONE): New.
+ * agent/command.c (do_one_keyinfo): Implement it.
+ * agent/findkey.c (agent_key_from_file): Ditto.
+ (agent_key_info_from_file): Ditto.
+ (agent_delete_key): Ditto.
+ * agent/protect.c (agent_private_key_type): Add detection for openpgp
+ "none" method.
+
+2015-01-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese Translation.
+
+2015-01-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Limit the size of key packets to a sensible value.
+ * g10/parse-packet.c (MAX_KEY_PACKET_LENGTH): New.
+ (MAX_UID_PACKET_LENGTH): New.
+ (MAX_COMMENT_PACKET_LENGTH): New.
+ (MAX_ATTR_PACKET_LENGTH): New.
+ (parse_key): Limit the size of a key packet to 256k.
+ (parse_user_id): Use macro for the packet size limit.
+ (parse_attribute): Ditto.
+ (parse_comment): Ditto.
+
+ gpg: Fix buffering problem in --list-config.
+ * g10/gpg.c (list_config): Replace print_sanitized_string2 by
+ es_write_sanitized.
+
+ * common/stringhelp.c (print_sanitized_buffer2): Remove.
+ (print_sanitized_buffer, print_sanitized_utf8_buffer): Remove.
+ (print_sanitized_utf8_buffer, print_sanitized_utf8_string): Remove.
+ (print_sanitized_string): Remove.
+
+ * sm/certdump.c (print_dn_part, print_dn_parts): Remove arg FP.
+ (pretty_print_sexp, gpgsm_print_name2, gpgsm_print_name): Remove.
+
+ Add a hook to be called right after main.
+ * common/init.c (early_system_init): New stub function.
+
+ gpg: Allow predefined names as answer to the keygen.algo prompt.
+ * g10/keygen.c (ask_algo): Add list of strings.
+
+ agent: Add some extra robustness to extract_private_key.
+ * agent/cvt-openpgp.c (extract_private_key): Add arg "arraysize".
+ Make sure that R_FLAGS and R_CURVE are set to NULL.
+
+2015-01-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix varargs call for 64-bit arch on ECC keys.
+ * scd/app-openpgp.c (store_fpr): Remove CARD_VERSION from the
+ arguments.
+ (rsa_writekey): Follow the change.
+ (do_genkey): Likewise.
+ (ecc_writekey): Likewise. Cast to size_t.
+
+2015-01-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix segv introduced to commit 4d7c9b0.
+ * g10/keygen.c (get_parameter_passphrase): Take care of R == NULL.
+
+2015-01-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix agent_public_key_from_file for ECC.
+ * agent/cvt-openpgp.c (extract_private_key): New.
+ (convert_to_openpgp): Use extract_private_key.
+ * agent/findkey.c (agent_public_key_from_file): Use
+ extract_private_key.
+
+2015-01-26 Werner Koch <wk at gnupg.org>
+
+ sm: Simplify fix ed8383c6.
+ * sm/minip12.c (p12_build): Release PWBUF only at the end.
+
+2015-01-25 Joshua Rogers <git at internot.info>
+
+ ccid: Remove incorrect expression leading to errors.
+ * scd/ccid-driver.c (send_escape_cmd): Fix setting of 'rc'.
+
+2015-01-23 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Fix validity check for UINT32 values.
+ * tools/gpgconf-comp.c (option_check_validity): Enable check for
+ UINT32.
+
+2015-01-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve skipping of PGP-2 keys.
+ * g10/keydb.c (keydb_search_first, keydb_search_next): Skip legacy
+ keys.
+ * g10/keyring.c (keyring_get_keyblock): Handle GPG_ERR_LEGACY_KEY.
+ (prepare_search): Ditto.
+ (keyring_rebuild_cache): Skip legacy keys.
+ * g10/keyserver.c (keyidlist): Ditto.
+ * g10/trustdb.c (validate_key_list): Ditto.
+
+ gpg: Add dedicated error code for PGP-2 keys.
+ * g10/parse-packet.c (parse_key): Return GPG_ERR_LEGACY_KEY for PGP2
+ keys.
+ * g10/import.c (read_block): Simplify by checking GPG_ERR_LEGACY_KEY.
+ * g10/getkey.c (lookup): Silence error message for PGP-2 keys.
+
+ * common/util.h (GPG_ERR_LEGACY_KEY): Add replacement for older
+ libgpg-error.
+
+ gpg: Replace remaining old error code macros by GPG_ERR_.
+ * g10/gpg.h (g10_errstr): Remove macro and change all occurrences by
+ gpg_strerror.
+ (G10ERR_): Remove all macros and change all occurrences by their
+ GPG_ERR_ counterparts.
+
+ gpg: Remove an unused variable.
+ * g10/getkey.c (getkey_ctx_s): Remove last_rc.
+
+2015-01-21 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix TLS build problems.
+ * dirmngr/Makefile.am (AM_CFLAGS): Add flags for TLS libs.
+
+ gpg: Support --passphrase with --quick-gen-key.
+ * g10/keygen.c: Include shareddefs.h.
+ (quick_generate_keypair): Support static passphrase.
+ (get_parameter_passphrase): New.
+ (do_generate_keypair): Use it.
+
+ gpg: Re-enable the "Passphrase" parameter for batch key generation.
+ * agent/command.c (cmd_genkey): Add option --inq-passwd.
+ * agent/genkey.c (agent_genkey): Add new arg override_passphrase.
+ * g10/call-agent.c (inq_genkey_parms): Handle NEWPASSWD keyword.
+ (agent_genkey): Add arg optional arg "passphrase".
+ * g10/keygen.c (common_gen, gen_elg, gen_dsa, gen_ecc)
+ (gen_rsa, do_create): Add arg "passphrase" and pass it through.
+ (do_generate_keypair): Make use of pPASSPHRASE.
+ (release_parameter_list): Wipe out a passphrase parameter.
+
+2015-01-19 Werner Koch <wk at gnupg.org>
+
+ kbx: Minor cleanup for the previous fix.
+ * kbx/keybox-search.c (blob_get_keyid): Rename to
+ blob_get_first_keyid. Check number of keys and remove blob type check.
+
+2015-01-19 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ kbx: Call skipfnc callback to filter out keys.
+ * kbx/keybox-search.c (blob_get_keyid): New.
+ (keybox-search): Call skipfnc callback function.
+
+2015-01-13 Andreas Schwier <andreas.schwier at cardcontact.de>
+
+ scd: Allow for certificates > 1024 with PC/SC.
+ * scd/pcsc-wrapper.c (handle_transmit): Enlarge buffer to 4096 too
+ allow for larger certificates.
+
+2015-01-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ dirmngr: Fix error code path of map_host.
+ * dirmngr/ks-engine-hkp.c (map_host): Fix error return.
+
+2015-01-08 Joshua Rogers <git at internot.info>
+
+ scd: fix get_public_key for OpenPGPcard v1.0.
+ * scd/app-openpgp.c (get_public_key): correctly close 'fp' upon use.
+
+2015-01-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ dirmngr: fix LDAP query PATTERNS limit check.
+ * dirmngr/ldap.c (start_cert_fetch_ldap): fix ARGC limitation.
+
+ scd: fix merge failure.
+ * scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
+ merge.
+
+2015-01-05 Werner Koch <wk at gnupg.org>
+
+ sm,g13: Init local vars to avoid compiler warnings.
+ * sm/misc.c (transform_sigval): Init RSA_S_LEN.
+ * g13/mount.c (read_keyblob): Init HEADERLEN.
+
+ gpg: Remove unused args from a function.
+ * g10/keyserver.c (parse_keyserver_uri): Remove args configname and
+ configlineno. Change all callers.
+
+ gpg: Clear a possible rest of the KDF secret buffer.
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Fix order of args.
+
+ build: Require automake 1.14.
+ * configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
+
+2015-01-04 Werner Koch <wk at gnupg.org>
+
+ agent: Make --allow-loopback-pinentry gpgconf changeable.
+
+2014-12-22 Joshua Rogers <git at internot.info>
+
+ tools: Free variable before return.
+ * tools/gpgconf-comp.c: Free 'dest_filename' before it is returned
+ upon error.
+
+2014-12-22 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ sm: Avoid double-free on iconv failure.
+ * sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
+ double-free of pwbuf.
+
+ scd: Avoid double-free on error condition in scd.
+ * scd/command.c (cmd_readkey): avoid double-free of cert
+
+ avoid future chance of using uninitialized memory.
+ * common/iobuf.c: (iobuf_open): initialize len
+
+ avoid double-close in unusual dotlock situations.
+ * common/dotlock.c: (dotlock_create_unix) avoid double-close()
+ in unusual situations.
+
+ gpgkey2ssh: clean up varargs.
+ * tools/gpgkey2ssh.c (key_to_blob) : ensure that va_end is called.
+
+2014-12-22 Werner Koch <wk at gnupg.org>
+
+ doc: Fix memory leak in yat2m.
+ * doc/yat2m.c (write_th): Free NAME.
+
+ dirmngr: Fix memory leak.
+ * dirmngr/server.c (cmd_ks_search, cmd_ks_get): Fix memory leak.
+
+ * dirmngr/ks-engine-hkp.c (ks_hkp_mark_host): Remove double check.
+
+ dirmngr: Remove un-needed check.
+ * dirmngr/crlfetch.c (crl_fetch): Check that URL is not NULL.
+
+ dirmngr,gpgsm: Return NULL on fail.
+ * dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
+ * sm/gpgsm.c (parse_keyserver_line): Ditto.
+
+2014-12-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: ECDH Support.
+ * agent/divert-scd.c (divert_pkdecrypt): Support ECDH.
+ * scd/app-openpgp.c (get_algo_byte, store_fpr): Support ECDH.
+ (send_key_attr): Support ECDH. Fix EdDSA algorithm value.
+ (retrieve_key_material): Initialize fields.
+ (get_public_key, ecc_writekey, do_writekey): Support ECDH.
+ (ecdh_writekey): Remove.
+ (do_decipher): Support ECDH.
+ (parse_algorithm_attribute): Support ECDH. Fix EdDSA.
+
+2014-12-19 Werner Koch <wk at gnupg.org>
+
+ agent: Make sure --max-cache-ttl is >= --default-cache-ttl.
+ * agent/gpg-agent.c (finalize_rereadable_options): New.
+ (main, reread_configuration): Call it.
+
+ agent: Keep the session environment for restricted connections.
+ * agent/command-ssh.c (setup_ssh_env): Move code to ...
+ * agent/gpg-agent.c (agent_copy_startup_env): .. new function. Change
+ calllers.
+ * agent/command.c (start_command_handler): Call that fucntion for
+ restricted connections.
+
+ agent: Fix string prepended to remotely initiated prompts.
+ * agent/command.c (cmd_setkeydesc): Use %0A and not \n. Make
+ translatable.
+
+2014-12-18 Werner Koch <wk at gnupg.org>
+
+ build: Remove option to build without agent.
+ * configure.ac (build-agent): Set to yes.
+
+2014-12-17 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Exit with failure if --launch fails.
+ * tools/gpgconf-comp.c (gc_component_launch): Return an error code.
+ * tools/gpgconf.c (main): Exit if launch failed.
+
+2014-12-16 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.1.
+
+ po: Update the German translation.
+
+2014-12-16 Petr Pisar <petr.pisar at atlas.cz>
+
+ po: Update Czech translation.
+
+2014-12-16 Werner Koch <wk at gnupg.org>
+
+ gpg: Show private DO information in the card status.
+ * g10/call-agent.c (agent_release_card_info): Free private_do.
+ (learn_status_cb): Parse PRIVATE-DO-n stati.
+
+2014-12-16 Ineiev <ineiev at gnu.org>
+
+ po: Update Russian translation.
+
+2014-12-16 Jedi <jedi at jedi.org>
+
+ po: Update zh_TW translation.
+
+2014-12-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Add sub-command "factory-reset" to --card-edit.
+ * common/util.h (GPG_ERR_OBJ_TERM_STATE): New.
+ * scd/iso7816.c (map_sw): Add this error code.
+ * scd/app-openpgp.c (do_getattr): Return the life cycle indicator.
+ * scd/app.c (select_application): Allow a return value of
+ GPG_ERR_OBJ_TERM_STATE.
+ * scd/scdaemon.c (set_debug): Print the DBG_READER value.
+ * g10/call-agent.c (start_agent): Print a status line for the
+ termination state.
+ (agent_scd_learn): Make arg "info" optional.
+ (agent_scd_apdu): New.
+ * g10/card-util.c (send_apdu): New.
+ (factory_reset): New.
+ (card_edit): Add command factory-reset.
+
+ gpg: Fix regression in notation data regression.
+ * g10/misc.c (pct_expando): Reorder conditions for clarity.
+ * g10/sign.c (write_signature_packets): Fix notation data creation.
+
+ gpg: Avoid extra LF in notaion data listing.
+ * g10/keylist.c (show_notation): Use log_printf.
+
+2014-12-12 Werner Koch <wk at gnupg.org>
+
+ scd: Fix possibly inhibited checkpin of the admin pin.
+ * scd/app-openpgp.c (do_check_pin): Do not check a byte of a released
+ buffer.
+
+ gpg: Let --card--status create a shadow key (card key stub).
+ * agent/command.c (cmd_learn): Add option --sendinfo.
+ * agent/learncard.c (agent_handle_learn): Add arg "send" andsend
+ certifciate only if that is set.
+ * g10/call-agent.c (agent_scd_learn): Use --sendinfo. Make INFO
+ optional.
+ (agent_learn): Remove.
+ * g10/keygen.c (gen_card_key): Replace agent_learn by agent_scd_learn.
+
+ gpg: Fix possible read of unallocated memory.
+ * g10/parse-packet.c (can_handle_critical): Check content length
+ before calling can_handle_critical_notation.
+
+2014-12-11 Werner Koch <wk at gnupg.org>
+
+ build: Replace deprecated autconf macro.
+ * m4/intl.m4: s/AM_PROG_MKDIR_P/AC_PROG_MKDIR_P/
+ * m4/po.m4: Ditto.
+
+2014-12-08 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Improve dead host detection.
+ * dirmngr/ks-engine-hkp.c (handle_send_request_error): Mark host dead
+ also for 2 other error messages.
+
+ http: Improve diagnostic messages.
+ * common/http.c (send_request): Print TLS alert info
+ (connect_server): Detect bogus DNS entry.
+
+ gpg: Obsolete some keyserver helper options.
+ * g10/options.h (opt): Remove keyserver_options.other.
+ * g10/gpg.c (main): Obsolete option --honor-http-proxt.
+ * g10/keyserver.c (add_canonical_option): Replace by ...
+ (warn_kshelper_option): New.
+ (parse_keyserver_uri): Obsolete "x-broken-http".
+
+ dirmngr: Return a proper error for all dead hosts.
+ * dirmngr/ks-engine-hkp.c (map_host): Change to return an gpg_error_t.
+ Return an error code for all dead hosts.
+ (make_host_part): Change to return an gpg_error_t. Change all
+ callers.
+
+ gpg: Write a status line for a failed --send-keys.
+ * g10/keyserver.c (keyserver_put): Write an status error.
+
+2014-12-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix for EdDSA.
+ * scd/app-openpgp.c (get_algo_byte): It catches 22.
+ (store_fpr): It's MPI usually, but it's opaque bytes for EdDSA.
+
+2014-12-05 Andre Heinecke <aheinecke at intevation.de>
+
+ Document no-allow-mark-trusted option.
+ doc: Document no-allow-mark-trusted for gpg-agent
+
+ * doc/gpg-agent.texi: Change allow-mark-trusted doc to
+ no-allow-mark-trusted.
+
+ --
+ Since rev. 78a56b14 allow-mark-trusted is the default option
+ and was replaced by no-allow-mark-trusted to disable the
+ interactive prompt.
+
+2014-12-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix for NIST P-256.
+ * g10/card-util.c (card_store_subkey): Error check.
+ * scd/app-opengpg.c (ecc_writekey): Support NIST P-256.
+ (do_writekey): Error check.
+
+2014-12-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow import of large keys.
+ * g10/import.c (import): Skip too large keys.
+ * kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 2MB to 5MB.
+
+2014-12-03 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove option aliases --[no-]throw-keyid and --notation-data.
+ * g10/gpg.c (opts): Remove them.
+ * g10/options.h (opt): s/throw_keyid/throw_keyids/ and change users.
+
+2014-12-02 Werner Koch <wk at gnupg.org>
+
+ agent: Replace some sprintf.
+ * agent/call-scd.c (agent_card_pksign): Replace sprintf by bin2hex.
+ * agent/command-ssh.c (ssh_identity_register): Ditto.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Replace sprintf by
+ put_membuf_printf.
+
+2014-12-01 Werner Koch <wk at gnupg.org>
+
+ tools: Improve watchgnupg portability.
+ * configure.ac (AC_CHECK_HEADERS): Check for sys.select.h
+ * tools/watchgnupg.c: Include it.
+
+ gpg: Fix export bug using exact search with only one key in the keybox.
+ * g10/export.c (do_export_stream): Disable caching.
+ * g10/keyserver.c (keyidlist): Ditto.
+
+ scd: Implement socket redirection.
+ * scd/scdaemon.c (ENAMETOOLONG): New.
+ (redir_socket_name): New.
+ (cleanup): Take care of a redirected socket.
+ (main): Pass redir_socket_name to create_server_socket.
+ (create_socket_name): Remove superfluous length check.
+ (create_server_socket): Add arg r_redir_name and implement
+ redirection. Replace assert for older Assuan by an error message.
+
+ dirmngr: Implement socket redirection.
+ * dirmngr/dirmngr.c (ENAMETOOLONG): new.
+ (redir_socket_name): New.
+ (main): Add Assuan socket redirection.
+ (cleanup): Adjust cleanup for redirection.
+
+2014-11-28 Werner Koch <wk at gnupg.org>
+
+ agent: Implement socket redirection.
+ * agent/gpg-agent.c (ENAMETOOLONG): New.
+ (redir_socket_name, redir_socket_name_extra)
+ (redir_socket_name_ssh): New.
+ (remove_socket): Take care of the redir names.
+ (main): Pass the redir names to create_server_socket.
+ (create_socket_name): Remove length check - that is anyway done later.
+ (create_server_socket): Add arg r_redir_name and implement redirection
+ if Libassuan is at least 2.14.
+
+ gpg: Change another BUG() call to a regular error message.
+ * g10/mainproc.c (proc_tree): Replace BUG by a proper error messages.
+
+ Add option --no-autostart.
+ * g10/gpg.c: Add option --no-autostart.
+ * sm/gpgsm.c: Ditto.
+ * g10/options.h (opt): Add field autostart.
+ * sm/gpgsm.h (opt): Ditto.
+ * g10/call-agent.c (start_agent): Print note if agent was not
+ autostarted.
+ * sm/call-agent.c (start_agent): Ditto.
+ * g10/call-dirmngr.c (create_context): Likewise.
+ * sm/call-dirmngr.c (start_dirmngr_ext): Ditto.
+
+2014-11-27 Мирослав Николић <wk at gnupg.org>
+
+ gpg-agent: Add restricted connection feature.
+ * agent/agent.h (opt): Add field extra_socket.
+ (server_control_s): Add field restricted.
+ * agent/command.c: Check restricted flag on many commands.
+ * agent/gpg-agent.c (oExtraSocket): New.
+ (opts): Add option --extra-socket.
+ (socket_name_extra): New.
+ (cleanup): Cleanup that socket name.
+ (main): Implement oExtraSocket.
+ (create_socket_name): Add arg homedir and change all callers.
+ (create_server_socket): Rename arg is_ssh to primary and change
+ callers.
+ (start_connection_thread): Take ctrl as arg.
+ (start_connection_thread_std): New.
+ (start_connection_thread_extra): New.
+ (handle_connections): Add arg listen_fd_extra and replace the
+ connection starting code by parameterized loop.
+ * common/asshelp.c (start_new_gpg_agent): Detect the use of the
+ restricted mode and don't fail on sending the pinentry environment.
+
+ * common/util.h (GPG_ERR_FORBIDDEN): New.
+
+ agent: Make auditing of the option list easier.
+ * agent/gpg-agent.c (opts): Use ARGPARSE_ macros.
+
+2014-11-26 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ dirmngr: Only report hkps scheme when available.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_help): Make use of TLS macros.
+
+2014-11-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Change a bug() call to a regular error message.
+ * g10/decrypt-data.c (decrypt_data): Return an error code instead of
+ calling BUG().
+
+2014-11-25 Werner Koch <wk at gnupg.org>
+
+ Fix buffer overflow in openpgp_oid_to_str.
+ * common/openpgp-oid.c (openpgp_oid_to_str): Fix unsigned underflow.
+
+ * common/t-openpgp-oid.c (BADOID): New.
+ (test_openpgp_oid_to_str): Add test cases.
+
+2014-11-24 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix use of uninit.value in listing sig subpkts.
+ * g10/parse-packet.c (dump_sig_subpkt): Print regex subpacket
+ sanitized.
+
+ gpg: Fix off-by-one read in the attribute subpacket parser.
+ * g10/parse-packet.c (parse_attribute_subpkts): Check that the
+ attribute packet is large enough for the subpacket type.
+
+ gpg: Fix batch generation of ECC keys.
+ * g10/keygen.c (get_parameter_algo): Map ECC algorithm strings
+ directly.
+
+2014-11-24 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Distinguish between ARGPARSE_AMBIGUOUS_{OPTION,COMMAND}
+ * common/argparse.c (initialize): Use correct value.
+
+ gpg: Refer to --throw-keyids instead of --throw-keyid.
+ * g10/encrypt.c: adjust error message
+
+2014-11-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Track number of skipped v3 keys on import.
+ * g10/import.c (stats_s): Add field v3keys.
+ (import): Update this field.
+ (import_print_stats): Print v3 key count.
+ (read_block): Skip v3 keys and return a count for them.
+
+ gpg: Fix regression in parse_key.
+ * g10/parse-packet.c (parse): Better return just the gpg_err_code.
+ (parse_key): Return the error code.
+
+ speedo: Add simple logos to the installer.
+ * build-aux/speedo/w32/README.txt: Include GnuPG Readme.
+ * build-aux/speedo/w32/gnupg-logo-150x57.bmp: New.
+ * build-aux/speedo/w32/gnupg-logo-164x314.bmp: New.
+ * build-aux/speedo/w32/inst.nsi: Add logos.
+ * build-aux/speedo.mk ($(bdir)/NEWS.tmp): Extract news items.
+
+2014-11-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix hash detection for ECDSA.
+ * g10/sign.c (sign_file): Use DSA or ECDSA and not DSA|EdDSA.
+
+ Fix linker problem on OS X.
+ * common/init.c (default_errsource): Move to the .data segmemt.
+
+2014-11-19 Werner Koch <wk at gnupg.org>
+
+ gpg-connect-agent: Add convenience option --uiserver.
+
+ Add "gpgconf --kill dirmngr" and avoid useless launch before a kill.
+ * common/asshelp.c (start_new_gpg_agent): Add arg autostart. Change
+ all callers to use 1 for it.
+ (start_new_dirmngr): Ditto.
+ * tools/gpg-connect-agent.c: Add option --no-autostart.
+ (main): Default autostart to 1.
+ (start_agent): Implement no-autostart.
+ * tools/gpgconf-comp.c (gpg_agent_runtime_change): Use --no-autostart.
+ (scdaemon_runtime_change): Ditto.
+ (dirmngr_runtime_change): New.
+
+ po: Copied missing translations from the 2.0 branch.
+ * po/LINGUAS: Add new translations.
+
+2014-11-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix a NULL-deref for invalid input data.
+ * g10/mainproc.c (proc_encrypted): Take care of canceled passpharse
+ entry.
+
+2014-11-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Make the use of "--verify FILE" for detached sigs harder.
+ * g10/openfile.c (open_sigfile): Factor some code out to ...
+ (get_matching_datafile): new function.
+ * g10/plaintext.c (hash_datafiles): Do not try to find matching file
+ in batch mode.
+ * g10/mainproc.c (check_sig_and_print): Print a warning if a possibly
+ matching data file is not used by a standard signatures.
+
+ gpg: Fix a missing LF in debug output.
+ * g10/kbnode.c (dump_kbnode): Print a LF.
+
+ gpg: Remove PGP-2 related cruft.
+ * g10/armor.c (parse_hash_header,carmor_filter): Ignore MD5 in hash
+ header.
+ (fake_packet): Remove pgp-2 workaround for white space stripping.
+ * g10/filter.h (armor_filter_context_t): Remove field pgp2mode.
+ * g10/options.h (opt): Remove field pgp2_workarounds.
+ * g10/gpg.c (main): Do not set this field.
+ * g10/gpgv.c (main): Ditto.
+ * g10/mainproc.c (proc_encrypted): Use SHA-1 as fallback s2k hash
+ algo. Using MD5 here is useless.
+ (proc_plaintext): Remove PGP-2 related woraround
+ (proc_tree): Remove another workaround but keep the one for PGP-5.
+
+2014-11-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve perceived speed of secret key listings.
+ * g10/keylist.c (list_keyblock): Flush stdout for secret keys.
+
+ gpg: Fix regression in --refresh-keys.
+ * g10/keyserver.c (keyserver_get): Factor all code out to ...
+ (keyserver_get_chunk): new. Extimate line length.
+ (keyserver_get): Split up requests into chunks.
+
+ gpg: Add import options "keep-ownertrust".
+ * g10/options.h (IMPORT_KEEP_OWNERTTRUST): New.
+ * g10/import.c (parse_import_options): Add "keep-ownertrust".
+ (import_one): Act upon new option.
+
+2014-11-11 Werner Koch <wk at gnupg.org>
+
+ Remove use of gnulib (part 2)
+ * configure.ac (strpbrk): Add to AC_CHECK_FUNCS.
+ (gl_EARLY): Remove.
+ * common/stringhelp.c (strpbrk) [!HAVE_STRPBRK]: New.
+ * common/sysutils.c (gnupg_mkdtemp): New. Based on code from
+ glibc-2.6.
+ (gnupg_setenv): Rewrite.
+ (gnupg_unsetenv): Rewrite.
+ * g10/exec.c: Include sysutils.h and replace mkdtemp by gnupg_mkdtemp.
+ * g13/be-encfs.c: Ditto.
+ * g13/mount.c: Ditto.
+ * tools/symcryptrun.c (confucius_mktmpdir): Ditto.
+
+ Remove use of gnulib (part 1)
+ * gl/: Remove entire tree.
+ * configure.ac: Remove gnulib tests and the gl/ Makefile.
+ (setenv): Add to AC_CHECK_FUNCS.
+ * autogen.rc (extra_aclocal_flags): Set to empty.
+ * Makefile.am (ACLOCAL_AMFLAGS): Remove -I gl/m4
+ (SUBDIRS): Remove gl/.
+ * agent/Makefile.am (common_libs): Remove ../gl/gnulib.a
+ * common/Makefile.am (t_common_ldadd): Ditto.
+ * dirmngr/Makefile.am (dirmngr_LDADD): Ditto.
+ (dirmngr_ldap_LDADD, dirmngr_client_LDADD): Ditto.
+ * g10/Makefile.am (needed_libs): Ditto.
+ * g13/Makefile.am (g13_LDADD): Ditto.
+ * kbx/Makefile.am (kbxutil_LDADD): Ditto.
+ ($(PROGRAMS)): Ditto.
+ * scd/Makefile.am (scdaemon_LDADD): Ditto.
+ * sm/Makefile.am (common_libs): Ditto.
+ * tools/Makefile.am (common_libs, commonpth_libs): Ditto.
+
+ * agent/gpg-agent.c: Remove "mkdtemp.h"
+ * g10/exec.c: Ditto.
+ * scd/scdaemon.c: Ditto.
+ * tools/symcryptrun.c: Ditto.
+ * common/sysutils.c: Remove "setenv.h"
+
+ * common/t-timestuff.c: Use putenv if setenv is not available.
+
+2014-11-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove warning message for non-implemented search modes.
+ * kbx/keybox-search.c (keybox_search): Silently ignore.
+ * doc/specify-user-id.texi: Docuement '@", '+', and '.' search
+ prefixes.
+
+ w32: Fix http access module.
+ * common/http.c (write_server) [W32]: Rework to use send() instead of
+ write even when build with npth.
+ (cookie_read) [W32]: Rework to use recv() instead of read even when
+ build with npth.
+
+ build: Add method to use a custom swdb.lst and use adns with Windows.
+ * build-aux/getswdb.sh: Add option --skip-verify.
+ * build-aux/speedo.mk: Add config var CUSTOM_SWDB. Tage adns version
+ from swdb and build for Windows with adns.
+
+ build: Improve test for ADNS.
+ * configure.ac <adns>: Use adns_free as probe function for libadns.
+ (HAVE_ADNS_FREE): Remove bogus tests to set this and remove the macro.
+ (ADNSLIBS): Do not ac_subst - it is only used within configure.
+
+2014-11-05 Werner Koch <wk at gnupg.org>
+
+ speedo: Append the date to the Windows installer.
+ * build-aux/speedo.mk (BUILD_DATESTR): New.
+ (dist-source, installer): Use it.
+
+ Release 2.1.0.
+
+ Avoid sign extension when shifting the MSB.
+ * sm/fingerprint.c (gpgsm_get_short_fingerprint): Cast MSB before
+ shifting.
+ * g10/build-packet.c (delete_sig_subpkt): Ditto.
+
+2014-11-04 Werner Koch <wk at gnupg.org>
+
+ Remove all expired common CA certificates.
+ * doc/com-certs.pem: Remove certifciates.
+
+2014-11-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid extra pinentries for each subkey in --export-secret-keys.
+ * agent/command.c (cmd_export_key): Actually implement the cache_nonce
+ feature.
+ * g10/export.c (do_export_stream): Make use of a cache_nonce.
+
+ gpg: Fix endless loop in keylisting with fingerprint.
+ * g10/getkey.c (getkey_next): Disable cache.
+
+ gpg: Minor cleanup for key listing related code.
+ * g10/getkey.c (get_pubkey_next): Divert to getkey_next.
+ (get_pubkey_end): Move code to getkey_end.
+ * g10/keydb.c (keydb_search_reset): Add a debug statement.
+ (dump_search_desc): Add arg HD and print the handle.
+
+ gpg: Do not show an useless passphrase prompt in batch mode.
+ * g10/keygen.c: Remove unused PASSPHRASE related code.
+ (proc_parameter_file): Remove useless asking for a passphrase in batch
+ mode.
+
+2014-10-31 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove superfluous check for Libgcrypt >= 1.4.0.
+ * g10/gpg.c (main): Remove check.
+
+ kbx: Let keydb_search skip unwanted blobs.
+ * kbx/keybox.h (keybox_blobtype_t): New.
+ * kbx/keybox-defs.h (BLOBTYPE_*): Replace by KEYBOX_BLOBTYPE_*.
+ * kbx/keybox-search.c (keybox_search): Add arg want_blobtype and skip
+ non-matching blobs.
+ * sm/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_X509 to keybox_search.
+ * g10/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_PGP to keybox_search.
+
+ gpg: Fix --rebuild-keydb-caches.
+ * g10/parse-packet.c (parse_key): Store even unsupported packet
+ versions.
+ * g10/keyring.c (keyring_rebuild_cache): Do not copy keys with
+ versions less than 4.
+
+ gpg: Fix testing for secret key availability.
+ * g10/getkey.c (have_secret_key_with_kid): Do not change the search
+ mode.
+
+ build: Avoid distributing backup files etc.
+ * Makefile.am (EXTRA_DIST): Do not include directories.
+
+2014-10-30 Werner Koch <wk at gnupg.org>
+
+ tests: Speed up the genkey1024.test by using not so strong random.
+ * agent/gpg-agent.c (oDebugQuickRandom): New.
+ (opts): New option --debug-quick-random.
+ (main): Use new option.
+ * common/asshelp.c (start_new_gpg_agent): Add hack to pass an
+ additional argument for the agent name.
+ * tests/openpgp/defs.inc: Pass --debug-quick-random to the gpg-agent
+ starting parameters.
+ * tests/openpgp/version.test: Ditto.
+
+2014-10-29 Werner Koch <wk at gnupg.org>
+
+ common: Check option arguments for a valid range.
+ * common/argparse.h (ARGPARSE_INVALID_ARG): New.
+ * common/argparse.c: Include limits h and errno.h.
+ (initialize): Add error strings for new error constant.
+ (set_opt_arg): Add range checking.
+
+ Fix stdint.h problem for Apple.
+ * gl/stdint_.h [__APPLE__]: Include hack.
+
+2014-10-27 Werner Koch <wk at gnupg.org>
+
+ speedo: Fixes for native build.
+ * build-aux/speedo.mk (TARGETOS): Init with empty string.
+ (speedo_pkg_gnupg_configure): Use --enable-gpg2-is-gpg only for w32.
+ (INST_VERSION, INST_PROD_VERSION): Create only for w32.
+
+2014-10-24 Werner Koch <wk at gnupg.org>
+
+ agent: Support pinentries with integrated repeat passphrase feature.
+ * agent/agent.h (struct pin_entry_info_s): Add fields repeat_okay and
+ with_repeat.
+ * agent/call-pinentry.c (close_button_status_cb): Rewrite and check
+ for PIN_REPEAT. Change users to check only the relevant bit.
+ (agent_askpin): Support repeat logic of new Pinentries.
+
+ * agent/command-ssh.c (ssh_identity_register): Use the new repeat
+ feature.
+ * agent/genkey.c (agent_ask_new_passphrase): Ditto.
+
+2014-10-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence "packet with obsolete versoin" warnings.
+ * g10/parse-packet.c (parse_key): Print warning only in very verbose
+ mode.
+
+ gpg: Make card key generation work again.
+ * g10/call-agent.c (agent_scd_learn): Rename from agent_learn.
+ (agent_learn): New.
+ * g10/keygen.c (gen_card_key): Call new agent-learn.
+
+2014-10-17 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow building without LDAP support.
+ * configure.ac: Add option --disable-ldap.
+ (USE_LDAP): New ac_define and am_conditional.
+ * dirmngr/Makefile.am: Take care of USE_LDAP.
+ * dirmngr/dirmngr.c (!USE_LDAP): Make all ldap options dummy options
+ and do not call any ldap function.
+ * dirmngr/server.c (!USE_LDAP): Do not call any ldap function.
+ * dirmngr/crlfetch.c (!USE_LDAP): Ditto.
+
+ w32: Set SYSROOT to help finding config scripts.
+ * autogen.sh <build-w32>: Set SYSROOT.
+
+ gpg: Remove all support for v3 keys and always create v4-signatures.
+ * g10/build-packet.c (do_key): Remove support for building v3 keys.
+ * g10/parse-packet.c (read_protected_v3_mpi): Remove.
+ (parse_key): Remove support for v3-keys. Add dedicated warnings for
+ v3-key packets.
+ * g10/keyid.c (hash_public_key): Remove v3-key support.
+ (keyid_from_pk): Ditto.
+ (fingerprint_from_pk): Ditto.
+
+ * g10/options.h (opt): Remove fields force_v3_sigs and force_v4_certs.
+ * g10/gpg.c (cmd_and_opt_values): Remove oForceV3Sigs, oNoForceV3Sigs,
+ oForceV4Certs, oNoForceV4Certs.
+ (opts): Turn --force-v3-sigs, --no-force-v3-sigs, --force-v4-certs,
+ --no-force-v4-certs int dummy options.
+ (main): Remove setting of the force_v3_sigs force_v4_certs flags.
+ * g10/revoke.c (gen_revoke, create_revocation): Always create v4 certs.
+ * g10/sign.c (hash_uid): Remove support for v3-signatures
+ (hash_sigversion_to_magic): Ditto.
+ (only_old_style): Remove this v3-key function.
+ (write_signature_packets): Remove support for creating v3-signatures.
+ (sign_file): Ditto.
+ (sign_symencrypt_file): Ditto.
+ (clearsign_file): Ditto. Remove code to emit no Hash armor line if
+ only v3-keys are used.
+ (make_keysig_packet): Remove arg SIGVERSION and force using
+ v4-signatures. Change all callers to not pass a value for this arg.
+ Remove all v3-key related code.
+ (update_keysig_packet): Remove v3-signature support.
+ * g10/keyedit.c (sign_uids): Always create v4-signatures.
+
+ * g10/textfilter.c (copy_clearsig_text): Remove arg pgp2mode and
+ change caller.
+
+2014-10-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove extra RSA import status line.
+ * g10/import.c (stats_s): Remove field "imported_rsa".
+ (import_print_stats): Do not print separate value for RSA.
+ (import_one): Remove the RSA counter.
+
+ gpg: Fix informative printing of user ids.
+ * g10/getkey.c (keyid_list): Add field "fpr".
+ (cache_user_id): Store fpr and check for dups only by fpr.
+ (get_pubkey_byfpr): New.
+ (get_user_id_string): Make static and use xasprintf.
+ (get_long_user_id_string): Use xasprintf.
+ (get_user_id_byfpr): New.
+ (get_user_id_byfpr_native): New.
+ * g10/keyid.c (fingerprint_from_pk): Make arg RET_LEN optional.
+ * g10/import.c (import_one): Use get_user_id_byfpr_native.
+
+ gpg: Allow importing keys with duplicated long key ids.
+ * g10/keydb.c (keydb_handle): Add field no_caching.
+ (keyblock_cache): Repalce field kid by fpr.
+ (keydb_disable_caching): New.
+ (keydb_search): Use the fingerprint as cache index.
+
+ * g10/import.c (import_one): Use the fingerprint and not the kid to
+ lookup the key. Call keydb_disable_caching beofre re-searching for
+ update.
+
+ * tests/openpgp/import.test: Add a test case.
+
+ tests: Speed up conventional encryption tests for gpg.
+ * tests/openpgp/conventional-mdc.test: Add an s2k-count option.
+ * tests/openpgp/conventional.test: Ditto.
+
+2014-10-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Minor change for better readability.
+ * g10/build-packet.c (write_version): Remove.
+ (do_pubkey_enc, do_onepass_sig): Write version directly.
+
+2014-10-10 Werner Koch <wk at gnupg.org>
+
+ doc: Fix a man page rendering problem.
+ * doc/gpg-agent.texi (Agent Configuration): Fix rendering of the
+ sshcontrol example.
+
+2014-10-10 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Add build and runtime support for larger RSA keys.
+ * configure.ac: Added --enable-large-secmem option.
+ * g10/options.h: Add opt.flags.large_rsa.
+ * g10/gpg.c: Contingent on configure option: adjust secmem size,
+ add gpg --enable-large-rsa, bound to opt.flags.large_rsa.
+ * g10/keygen.c: Adjust max RSA size based on opt.flags.large_rsa
+ * doc/gpg.texi: Document --enable-large-rsa.
+
+2014-10-09 Werner Koch <wk at gnupg.org>
+
+ gpg: Skip overlong keys and a print a warning.
+ * kbx/keybox-search.c (keybox_search): Add arg r_skipped and skip too
+ long blobs.
+ * sm/keydb.c (keydb_search): Call keybox_search with a dummy param.
+ * g10/keydb.c (struct keydb_handle): Add field skipped_long_blobs.
+ (keydb_search_reset): Reset that field.
+ (keydb_search): Update that field.
+ (keydb_get_skipped_counter): New.
+ * g10/keylist.c (list_all): Print count of skipped keys.
+
+ gpg: Sync keylist output and warning messages.
+ * g10/keylist.c (list_all): Flush stdout before logging.
+ * g10/misc.c (print_pubkey_algo_note): Ditto.
+ (print_cipher_algo_note): Ditto.
+ (print_digest_algo_note): Ditto.
+ (print_md5_rejected_note): Ditto.
+
+ kbx: Fix handling of overlong keys.
+ * kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 10^6 to 2MiB.
+ (_keybox_read_blob2): Skip too long record records.
+ (_keybox_write_blob): Do not accept too long record.
+ * kbx/keybox-dump.c (file_stats_s): Add field skipped_long_blobs.
+ (_keybox_dump_file): Print new counter.
+ (_keybox_dump_file): Skip too long records.
+ ----
+
+ To test this feature you may set the limit back to 1MiB and use key
+ F7F0E70F307D56ED which is in my local copy close to 2MiB. Without
+ this patch it was possible to import the key but access to that key
+ and all keys stored after it was not possible.
+
+ gpg: Take care to use pubring.kbx if it has ever been used.
+ * kbx/keybox-defs.h (struct keybox_handle): Add field for_openpgp.
+ * kbx/keybox-file.c (_keybox_write_header_blob): Set openpgp header
+ flag.
+ * kbx/keybox-blob.c (_keybox_update_header_blob): Add arg for_openpgp
+ and set header flag.
+ * kbx/keybox-init.c (keybox_new): Rename to do_keybox_new, make static
+ and add arg for_openpgp.
+ (keybox_new_openpgp, keybox_new_x509): New. Use them instead of the
+ former keybox_new.
+ * kbx/keybox-update.c (blob_filecopy): Add arg for_openpgp and set the
+ openpgp header flags.
+
+ * g10/keydb.c (rt_from_file): New. Factored out and extended from
+ keydb_add_resource.
+ (keydb_add_resource): Switch to the kbx file if it has the openpgp
+ flag set.
+
+ * kbx/keybox-dump.c (dump_header_blob): Print header flags.
+
+2014-10-09 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Avoid unnecessary library linkage.
+ * dirmngr/Makefile.am: Avoid $(DNSLIBS) for dirmngr_ldap
+ * g10/Makefile.am: $(LIBREADLINE) is only for gpg2; gpgv2 does not
+ need $(LIBASSUAN_LIBS)
+ * sm/Makefile.am: gpgsm does not need $(ZLIBS)
+ * tools/Makefile.am: gpgconf does not need $(NPTH_LIBS)
+
+2014-10-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid error exit if keygrip computations fails in a key listing.
+ * g10/keyid.c (keygrip_from_pk): Use log_info and clear array on error.
+
+2014-10-03 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta864.
+
+ gpg: Allow creating a cert-only primary key.
+ * g10/keygen.c (ask_key_flags): Allow a 'c' in direct entry.
+
+ build: Add configure options --disable-{ntb,gnu}tls.
+ * configure.ac: Add --disable-ntbtls and --disable-gnutls.
+
+2014-10-03 Andre Heinecke <aheinecke at intevation.de>
+
+ gpg: Check gpg-agent version before 2.1 migration.
+ * g10/call-agent.c, g10/call-agent.h (agent_get_version): New.
+ * g10/migrate.c (migrate_secring): Abort migration if
+ agent_get_version returns not at least 2.1.0
+
+2014-10-03 Werner Koch <wk at gnupg.org>
+
+ po: Update German translation.
+
+ Remove support for the GPG_AGENT_INFO envvar.
+ * agent/agent.h (opt): Remove field use_standard_socket.
+ * agent/command.c (cmd_killagent): Always allow killing.
+ * agent/gpg-agent.c (main): Turn --{no,}use-standard-socket and
+ --write-env-file into dummy options. Always return true for
+ --use-standard-socket-p. Do not print the GPG_AGENT_INFO envvar
+ setting or set that envvar.
+ (create_socket_name): Simplify by removing non standard socket
+ support.
+ (check_for_running_agent): Ditto.
+ * common/asshelp.c (start_new_gpg_agent): Remove GPG_AGENT_INFO use.
+ * common/simple-pwquery.c (agent_open): Ditto.
+ * configure.ac (GPG_AGENT_INFO_NAME): Remove.
+ * g10/server.c (gpg_server): Do not print the AgentInfo comment.
+ * g13/server.c (g13_server): Ditto.
+ * sm/server.c (gpgsm_server): Ditto.
+ * tools/gpgconf.c (main): Simplify by removing non standard socket
+ support.
+
+2014-10-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix regression removing SHA256.
+ * g10/misc.c (map_md_openpgp_to_gcry): Always use SHA256.
+
+ First changes for future use of NTBTLS.
+ * configure.ac (NEED_NTBTLS_ABI, NEED_NTBTLS_VERSION): New.
+ (HTTP_USE_NTBTLS): New. Prefer over GNUTLS.
+ * m4/ntbtls.m4: New.
+ * m4/Makefile.am (EXTRA_DIST): Add new file.
+ * common/http.c: Add conditionals to eventually use NTBTLS.
+
+ build: Update m4 scripts.
+ * m4/gpg-error.m4: Update from Libgpg-error git master.
+ * m4/libgcrypt.m4: Update from Libgcrypt git master.
+ * configure.ac: Declare SYSROOT a precious variable. Add extra error
+ message for library configuration mismatches.
+
+2014-09-29 Werner Koch <wk at gnupg.org>
+
+ doc: Remove GnuPG-1 related parts from gpg.texi.
+ * doc/Makefile.am (YAT2M_OPTIONS): Add 2.1 to the source info.
+ * doc/gpg.texi: Remove gpg1 related texts.
+
+2014-09-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Default to SHA-256 for all signature types on RSA keys.
+ * g10/main.h (DEFAULT_DIGEST_ALGO): Use SHA256 in --gnupg and SHA1 in
+ strict RFC or PGP modes.
+ * g10/sign.c (make_keysig_packet): Use DEFAULT_DIGEST_ALGO also for
+ RSA key signatures.
+ * configure.ac: Do not allow to disable sha256.
+
+ gpg: Simplify command --gen-key and add --full-gen-key.
+ * g10/gpg.c (aFullKeygen): New.
+ (opts): Add command --full-key-gen.
+ (main): Implement it.
+ * g10/keygen.c (DEFAULT_STD_ALGO): Replace wrong GCRY_PK_RSA although
+ the value is identical.
+ (DEFAULT_STD_CURVE): New.
+ (DEFAULT_STD_SUBALGO): New.
+ (DEFAULT_STD_SUBKEYSIZE): New.
+ (DEFAULT_STD_SUBCURVE): New.
+ (quick_generate_keypair): Use new macros here.
+ (generate_keypair): Add arg "full" and fix call callers. Do not ask
+ for keysize in non-full node.
+ (ask_user_id): Add arg "full" and simplify for non-full mode.
+
+2014-09-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Add shortcut for setting key capabilities.
+ * g10/keygen.c (ask_key_flags): Add shortcut '='.
+ * doc/help.txt (gpg.keygen.flags): New.
+
+2014-09-25 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not always print dashes in obsolete_option.
+ * g10/gpg.c (main): Pass option names to obsolete_option without
+ double dash.
+ * g10/misc.c (obsolete_option, obsolete_scdaemon_option): Print double
+ dash only for command line options.
+
+2014-09-25 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.
+ * g10/gpg.c: Add config options that should belong in scdaemon.conf
+ * g10/main.h, g10/misc.c (obsolete_scdaemon_option): New.
+
+2014-09-22 Werner Koch <wk at gnupg.org>
+
+ speedo: Check that wget and gpgv are installed.
+ * build-aux/getswdb.sh: Check for required tools.
+
+ speedo: Autodetect sha1sum tools.
+ * build-aux/getswdb.sh: Add option --find-sha1sum.
+ * build-aux/speedo.mk (check-tools): New phony target. Not yet used.
+ (SHA1SUM): New var. Use it instead of sha1sum.
+
+ gpg: Create default keyring with .kbx suffix.
+ * g10/keydb.c (maybe_create_keyring_or_box): Rename arg for clarity.
+ (keydb_add_resource): Fix order of args to maybe_create_keyring_or_box
+ and check and create .kbx.
+
+2014-09-20 Werner Koch <wk at gnupg.org>
+
+ gpg: --delete-secret-key - check that a secret key exists.
+ * g10/delkey.c (do_delete_key): Check availibility of a secret key.
+
+ gpg: Make algorithm selection prompt for ECC more clear.
+ * g10/keygen.c (ask_algo): Change 9 to "ECC and ECC".
+
+2014-09-18 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta834.
+
+ speedo: Distribute needed files.
+ * Makefile.am (EXTRA_DIST): Add speedo stuff.
+
+ build: Enable gpgtar by default.
+
+ common: Do not build maintainer modules in non-maintainer mode.
+ * common/Makefile.am (module_maint_tests): Use only in maintainer
+ mode.
+ (t_common_cflags): New.
+
+ common: Remove superfluous statements.
+ * common/exechelp-posix.c: Remove weak pragmas.
+ * common/sexputil.c (make_canon_sexp_from_rsa_pk): Remove double
+ const.
+
+ g13: Avoid segv after pipe creation failure.
+ * g13/call-gpg.c (gpg_encrypt_blob): Init some vars in case of an
+ early error.
+ (gpg_decrypt_blob): Ditto.
+
+ scd: Fix int/short mismatch in format string of app-p15.c.
+ * scd/app-p15.c (parse_certid): Use snprintf and cast value.
+ (send_certinfo): Ditto.
+ (send_keypairinfo): Ditto.
+ (do_getattr): Ditto.
+
+ agent: Init a local variable in the error case.
+ * agent/pksign.c (do_encode_md): Init HASH on error.
+
+ agent: Remove left over debug output.
+ * agent/command-ssh.c (ssh_signature_encoder_eddsa): Remove debug
+ output.
+
+ agent: Silence compiler warning for a debug message.
+ * agent/call-pinentry.c (agent_query_dump_state): Use %p for
+ POPUP_TID.
+
+ sm: Silence compiler warnings.
+ * sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Remove unused var I.
+ * sm/certreqgen.c (proc_parameters): Init PUBLIC to avoid compiler
+ warning.
+
+ gpg: Silence a compiler warning.
+ * g10/parse-packet.c (enum_sig_subpkt): Replace hack.
+
+ gpg: Replace a hash algo test function.
+ * g10/gpg.c (print_mds): Replace openpgp_md_test_algo.
+
+ speedo: Various fixes.
+ * build-aux/speedo.mk: Take zlib and bzip2 from ftp.gnupg.org. Minor
+ other fixes.
+
+2014-09-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Print a warning if the subkey expiration may not be what you want.
+ * g10/keyedit.c (subkey_expire_warning): New.
+ (keyedit_menu): Call it when needed.
+
+ gpg: Improve passphrase caching.
+ * agent/cache.c (last_stored_cache_key): New.
+ (agent_get_cache): Allow NULL for KEY.
+ (agent_store_cache_hit): New.
+ * agent/findkey.c (unprotect): Call new function and try to use the
+ last stored key.
+
+ * g10/revoke.c (create_revocation): Add arg CACHE_NONCE and pass to
+ make_keysig_packet.
+ (gen_standard_revoke): Add arg CACHE_NONCE and pass to
+ create_revocation.
+ * g10/keygen.c (do_generate_keypair): Call gen_standard_revoke with
+ cache nonce.
+
+2014-09-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Use algorithm id 22 for EdDSA.
+ * common/openpgpdefs.h (PUBKEY_ALGO_EDDSA): Change to 22.
+ * g10/keygen.c (ask_curve): Reword the Curve25519 warning note.
+
+2014-09-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Stop early on bogus old style comment packets.
+ * g10/parse-packet.c (parse_key): Take care of too short packets for
+ old style commet packets.
+
+2014-09-10 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Support https for KS_FETCH.
+ * dirmngr/ks-engine-hkp.c (cert_log_cb): Move to ...
+ * dirmngr/misc.c (cert_log_cb): here.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Support 307-redirection
+ and https.
+
+ dirmngr: Fix the ks_fetch command for the http scheme.
+ * common/http.c (http_session_ref): Allow for NULL arg.
+
+2014-09-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix memory leak in ECC encryption.
+ * g10/pkglue.c (pk_encrypt): Fix memory leak and streamline error
+ handling.
+
+2014-09-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix export of NIST ECC keys.
+ * common/openpgp-oid.c (struct oidtable): New.
+ (openpgp_curve_to_oid): Rewrite and allow OID as input.
+ (openpgp_oid_to_curve): Make use of the new table.
+
+ agent: Fix import of OpenPGP EdDSA keys.
+ * agent/cvt-openpgp.c (get_keygrip): Special case EdDSA.
+ (convert_secret_key): Ditto.
+ (convert_transfer_key): Ditto.
+ (apply_protection): Handle opaque MPIs.
+
+ (do_unprotect): Check FLAG_OPAQUE instead of FLAG_USER1 before
+ unpacking an opaque mpi.
+
+2014-09-01 Kyle Butt <kylebutt at gmail.com>
+
+ gpg: Fix export of ecc secret keys by adjusting check ordering.
+ * g10/export.c (transfer_format_to_openpgp): Move the check against
+ PUBKEY_MAX_NSKEY to after the ECC code adjusts the number of
+ parameters.
+
+2014-09-01 Werner Koch <wk at gnupg.org>
+
+ agent: Allow key unprotection using AES-256.
+ * agent/protect.c (PROT_CIPHER): Rename to GCRY_CIPHER_AES128 for
+ clarity.
+ (do_decryption): Add args prot_cipher and prot_cipher_keylen. USe
+ them instead of the hardwired values.
+ (agent_unprotect): Change to use a table of protection algorithms.
+ Add AES-256 variant.
+
+2014-08-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not show "MD5" and triplicated "RSA" in --version.
+ * g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
+ (build_list_md_test_algo): Ignore MD5.
+
+ gpg: Do not show "MD5" and triplicated "RSA" in --version.
+ * g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
+ (build_list_md_test_algo): Ignore MD5.
+
+2014-08-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove CAST5 from the default prefs and order SHA-1 last.
+ * g10/keygen.c (keygen_set_std_prefs): Update prefs.
+
+ Switch to the libgpg-error provided estream.
+ * configure.ac (NEED_GPG_ERROR_VERSION): Reguire 1.14.
+ (GPGRT_ENABLE_ES_MACROS): Define.
+ (estream_INIT): Remove.
+ * m4/estream.m4: Remove.
+ * common/estream-printf.c, common/estream-printf.h: Remove.
+ * common/estream.c, common/estream.h: Remove.
+ * common/init.c (_init_common_subsystems): Call gpgrt initialization.
+
+ gpg: Allow for positional parameters in the passphrase prompt.
+ * g10/passphrase.c (passphrase_get): Replace sprintf by xasprintf.
+
+2014-08-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix "can't handle public key algorithm" warning.
+ * g10/parse-packet.c (unknown_pubkey_warning): Check for encr/sign
+ capabilities.
+
+2014-08-19 Werner Koch <wk at gnupg.org>
+
+ speedo: Get version numbers from online database.
+ * build-aux/getswdb.sh: New.
+ * build-aux/speedo.mk: Get release version numbers from swdb.lst.
+
+ build: Create VERSION file via autoconf.
+ * Makefile.am (dist-hook): Remove creation of VERSION.
+ (EXTRA_DIST): Add VERSION.
+ * configure.ac: Let autoconf create VERSION.
+
+2014-08-18 Werner Koch <wk at gnupg.org>
+
+ gpg: Install the current release signing pubkey.
+ * g10/distsigkey.gpg: New.
+
+ agent: Return NO_SECKEY instead of ENONET for PKSIGN and others.
+ * agent/pksign.c (agent_pksign_do): Replace ENONET by NO_SECKEY.
+ * agent/findkey.c (agent_key_from_file): No diagnostic for NO_SECKEY.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Replace checking for ENOENT.
+
+ kbx: Make user id and signature data optional for OpenPGP.
+ * kbx/keybox-blob.c (_keybox_create_openpgp_blob): Remove restriction.
+
+ gpg: Change default cipher for --symmetric from CAST5 to AES-128.
+ * g10/main.h (DEFAULT_CIPHER_ALGO): Chhange to AES or CAST5 or 3DES
+ depending on configure option.
+ * g10/gpg.c (main): Set opt.s2k_cipher_algo to DEFAULT_CIPHER_ALGO.
+
+ yat2m: Support @set and @value.
+ * doc/yat2m.c (variablelist): New.
+ (set_variable): New.
+ (macro_set_p): Also check the variables.
+ (proc_texi_cmd): Support the @value command.
+ (parse_file): Support the @set command.
+ (top_parse_file): Release variablelist.
+
+ yat2m: Support the $* command for man page rendering.
+
+2014-08-17 Werner Koch <wk at gnupg.org>
+
+ estream: Change license from GPL to LPGL.
+ * common/estream-printf.c, common/estream-printf.h: Change license.
+ * common/estream.c, common/estream.h: Ditto.
+
+2014-08-14 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta783.
+
+ po: Update the German (de) translation.
+
+ sm: Create homedir and lock empty keybox creation.
+ * sm/gpgsm.h (opt): Add field "no_homedir_creation".
+ * sm/gpgsm.c (main): Set it if --no-options is used.
+ * sm/keydb.c (try_make_homedir): New. Similar to the one from
+ g10/openfile.c.
+ (maybe_create_keybox): New. Similar to the one from g10/keydb.c.
+ (keydb_add_resource): Replace some code by maybe_create_keybox.
+
+ gpg: Screen keyserver responses.
+ * g10/main.h (import_screener_t): New.
+ * g10/import.c (import): Add screener callbacks to param list.
+ (import_one): Ditto.
+ (import_secret_one): Ditto.
+ (import_keys_internal): Ditto.
+ (import_keys_stream): Ditto.
+ * g10/keyserver.c (struct ks_retrieval_screener_arg_s): New.
+ (keyserver_retrieval_screener): New.
+ (keyserver_get): Pass screener to import_keys_es_stream().
+
+ scd: Minor changes to app-sc-hsm.
+ * scd/app-sc-hsm.c: Re-indendet some parts and set some vars to NULL
+ after xfree for improbed robustness.
+ (read_ef_prkd): Replace serial operator by blocks for better
+ readability.
+ (apply_PKCS_padding): Rewrite for easier auditing.
+ (strip_PKCS15_padding): Ditto. Add stricter check on SRCLEN.
+
+ gpg: Disable an MD5 workaround for pgp2 by default.
+ * g10/sig-check.c (do_check): Move some code to ...
+ * g10/misc.c (print_md5_rejected_note): new function.
+ * g10/mainproc.c (proc_tree, proc_plaintext): Enable MD5 workaround
+ only if option --allow-weak-digest-algos is used.
+
+ gpg: Remove options --pgp2 and --rfc1991.
+ * g10/gpg.c (oRFC1991, oPGP2): Remove
+ (opts): Remove --pgp2 and --rfc1991.
+ * g10/options.h (CO_PGP2, CO_RFC1991): Remove. Remove all users.
+ (RFC2440, PGP2): Remove. Remove all code only enabled by these
+ conditions.
+ * tests/openpgp/clearsig.test: Remove --rfc1991 test.
+
+ build: Fix autogen.sh base version hack.
+ * autogen.sh <find-version>: Fix.
+
+ gpg: Remove --compress-keys and --compress-sigs feature.
+ * g10/gpg.c (oCompressKeys, oCompressSigs): Remove.
+ (opts): Turn --compress-keys and --compress-signs in NOPs.
+ * g10/options.h (opt): Remove fields compress_keys and compress_sigs.
+ * g10/export.c (do_export): Remove compress_keys feature.
+ * g10/sign.c (sign_file): Remove compress_sigs feature.
+
+2014-08-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Add list-option "show-usage".
+ * g10/gpg.c (parse_list_options): Add "show-usage".
+ * g10/options.h (LIST_SHOW_USAGE): New.
+ * g10/keyid.c (usagestr_from_pk): Add arg FILL. Change caller.
+ * g10/keylist.c (list_keyblock_print): Print usage info.
+
+2014-08-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Make --with-colons work again for --search-keys.
+ * g10/keyserver.c (search_line_handler): Replace log_debug by
+ es_printf.
+
+2014-08-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2014-07-25 Werner Koch <wk at gnupg.org>
+
+ scd: Minor and editorial changes to app-sc-hsm.c.
+ * scd/app-sc-hsm.c (select_and_read_binary): Use SW_ macro.
+ (parse_certid): Remove useless test.
+ (send_certinfo, send_keypairinfo): Shrink malloc to the needed size.
+ (do_getattr): Ditto.
+ (verify_pin): Use SW_ macro.
+ (do_decipher): Replace OFS variable and extend comment.
+
+ scd: Add a new status word code.
+ * scd/apdu.h (SW_REF_DATA_INV): New.
+ * scd/apdu.c (apdu_strerror): Add string.
+
+2014-07-25 Andreas Schwier <andreas.schwier at cardcontact.de>
+
+ scd: Support for SmartCard-HSM.
+ * scd/app-sc-hsm.c: New.
+ * scd/app.c (select_application, get_supported_applications): Register
+ new app.
+
+2014-07-25 Werner Koch <wk at gnupg.org>
+
+ gpg: Switch to an EdDSA format with prefix byte.
+ * g10/keygen.c (gen_ecc): USe "comp" for EdDSA.
+
+2014-07-23 Werner Koch <wk at gnupg.org>
+
+ agent: Show just one warning with all failed passphrase constraints.
+ * agent/genkey.c (check_passphrase_constraints): Build a final warning
+ after all checks.
+
+ agent: Only one confirmation prompt for an empty passphrase.
+ * agent/genkey.c (check_passphrase_constraints): Moev empty passphrase
+ check to the front.
+
+ gpg: Add command --quick-gen-key.
+ * g10/gpg.c (aQuickKeygen): New.
+ * g10/misc.c (is_valid_user_id): New stub.
+ * g10/keygen.c (quickgen_set_para): New.
+ (quick_generate_keypair): New.
+
+ common: Add cpr_get_answer_is_yes_def()
+ * g10/cpr.c (cpr_get_answer_is_yes): Factor code out to ....
+ (cpr_get_answer_is_yes_def): ...new.
+
+ gpg: Make --quick-sign-key promote local key signatures.
+ * g10/keyedit.c (sign_uids): Promote local sigs in quick mode.
+
+2014-07-22 Werner Koch <wk at gnupg.org>
+
+ scd: Do not use the pcsc-wrapper.
+ * scd/apdu.c (NEED_PCSC_WRAPPER): Do not define.
+ * scd/Makefile.am (libexec_PROGRAMS): Remove gnupg-pcsc-wrapper
+ (gnupg_pcsc_wrapper_SOURCES): Remove.
+ (gnupg_pcsc_wrapper_LDADD): Remove.
+ (gnupg_pcsc_wrapper_CFLAGS): Remove.
+
+2014-07-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve --list-packets output for faulty packets.
+ * g10/parse-packet.c: Add list_mode output for certain failures.
+
+ gpg: Cap size of attribute packets at 16MB.
+ * g10/parse-packet.c (parse_attribute): Avoid xmalloc failure and cap
+ size of packet.
+
+2014-07-03 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta751.
+
+ gpg: Make show-uid-validity the default.
+
+ tests: Fix end-of-all-ticks test for Western locales.
+ * common/t-timestuff.c (test_timegm): Use timegm if available.
+ (main): Set TX to UTC if timegm is not available.
+
+2014-07-03 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ gpg: Spelling error.
+
+2014-06-30 Werner Koch <wk at gnupg.org>
+
+ gpg: Auto-create revocation certificates.
+ * configure.ac (GNUPG_OPENPGP_REVOC_DIR): New config define.
+ * g10/revoke.c (create_revocation): Add arg "leadin".
+ (gen_standard_revoke): New.
+ * g10/openfile.c (get_openpgp_revocdir): New.
+ (open_outfile): Add MODE value 3.
+ * g10/keyid.c (hexfingerprint): New.
+ * g10/keygen.c (do_generate_keypair): Call gen_standard_revoke.
+
+ estream: Fix minor glitch in "%.*s" format.
+ * common/estream-printf.c (pr_string): Take care of non-nul terminated
+ strings.
+
+ gpg: Rearrange code in gen_revoke.
+ * g10/revoke.c (gen_revoke): Factor some code out to ...
+ (create_revocation): new.
+
+ gpg: Create exported secret files and revocs with mode 700.
+ * common/iobuf.c (direct_open): Add arg MODE700.
+ (iobuf_create): Ditto.
+ * g10/openfile.c (open_outfile): Add arg RESTRICTEDPERM. Change call
+ callers to pass 0 for it.
+ * g10/revoke.c (gen_desig_revoke, gen_revoke): Here pass true for new
+ arg.
+ * g10/export.c (do_export): Pass true for new arg if SECRET is true.
+
+ common: Minor code cleanup for a legacy OS.
+ * common/iobuf.c (direct_open) [__riscos__]: Simply cpp conditionals.
+
+2014-06-27 Werner Koch <wk at gnupg.org>
+
+ speedo: Fix the w32 installer name.
+
+ po: Update some strings of the French (fr) translation.
+
+ po: Update the German (de) translation.
+
+ agent: Adjust for changed npth_eselect under W32.
+ * agent/gpg-agent.c (handle_connections) [W32]: Make events_set an
+ unsigned int to match the changed prototype.
+
+ dirmngr: Use the homedir based socket also under W32.
+ * common/homedir.c (dirmngr_user_socket_name): Use same code for all
+ platforms.
+
+2014-06-27 Yuri Chornoivan <yurchor at ukr.net>
+
+ po: Update and enable Ukrainian (uk) translation.
+
+ Fix typos in messages.
+
+2014-06-27 Werner Koch <wk at gnupg.org>
+
+ build: Remove unused options.
+ * configure.ac: Remove option --build-agent-only.
+ (FAKE_CURL, GPGKEYS_CURL): Remove check for cURL
+ (GPGKEYS_MAILTO): Remove ac_subst but keep the currently unused
+ SENDMAIL check.
+ (GPGKEYS_KDNS): Remove ac_subst.
+ * autogen.rc (final_info): Remove suggestion to use the removed option
+ --enable-mailto.
+
+2014-06-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Add pinpad support for REINER SCT cyberJack go.
+ * scd/ccid-driver.h (VENDOR_REINER, CYBERJACK_GO): New.
+ * scd/ccid-driver.c (ccid_transceive_secure): Handle the case for
+ VENDOR_REINER. Original work was by Alina Friedrichsen (tiny change).
+
+2014-06-27 Werner Koch <wk at gnupg.org>
+
+ scd: Support reader Gemalto IDBridge CT30.
+ * scd/ccid-driver.h (GEMPC_CT30): New product id.
+ * scd/ccid-driver.c (parse_ccid_descriptor): Add quirk for that
+ reader.
+
+2014-06-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Limit keysize for unattended key generation to useful values.
+ * g10/keygen.c (gen_elg): Enforce keysize 1024 to 4096.
+ (gen_rsa): Enforce keysize 1024 to 4096.
+ (gen_dsa): Enforce keysize 768 to 3072.
+
+ Enable DNS SRV records again.
+ * configure.ac (GPGKEYS_HKP, GPGKEYS_FINGER): Remove ac_subst.
+ (use_dns_srv): Make test work.
+
+ agent: Fix export of RSA keys to OpenPGP.
+ * agent/cvt-openpgp.c (convert_transfer_key): Fix sexp build format
+ string.
+
+ gpg,gpgsm: Simplify wrong_args function.
+
+ speedo: "make clean-gnupg" may not remove the source.
+ * build-aux/speedo.mk (clean-$(1)): Take care of gnupg.
+
+ gpgsm: Fix default config name.
+
+2014-06-25 Werner Koch <wk at gnupg.org>
+
+ doc: Improve the rendering of the manual.
+
+ doc: Update for modern makeinfo.
+ * doc/texi.css: Remove.
+ * doc/Makefile.am (AM_MAKEINFOFLAGS): Use --css-ref.
+
+ gpg: Allow key-to-card upload for cert-only keys.
+ * g10/card-util.c (card_store_subkey): Allo CERT usage for key 0.
+
+2014-06-24 Werner Koch <wk at gnupg.org>
+
+ doc: Add conditionals for GnuPG-1.
+
+2014-06-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Make export of ECC keys work again.
+ * agent/cvt-openpgp.c (convert_to_openpgp): Use the curve name instead
+ of the curve parameters.
+ * g10/export.c (canon_pubkey_algo): Rename to ...
+ (canon_pk_algo): this. Support ECC.
+ (transfer_format_to_openpgp): Expect curve name.
+
+ gpg: Avoid infinite loop in uncompressing garbled packets.
+ * g10/compress.c (do_uncompress): Limit the number of extra FF bytes.
+
+2014-06-17 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ gpg: Fix a couple of spelling errors.
+
+2014-06-17 Werner Koch <wk at gnupg.org>
+
+ speedo: Support building from dist-source generated tarball.
+
+2014-06-13 Werner Koch <wk at gnupg.org>
+
+ http: Print human readable GNUTLS status.
+ * common/http.c (send_gnutls_bye): Take care of EAGAIN et al.
+ (http_verify_server_credentials): Print a human readable status.
+
+2014-06-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve the output of --list-packets.
+ * g10/parse-packet.c (parse): Print packet meta info in list mode.
+
+2014-06-11 Werner Koch <wk at gnupg.org>
+
+ speedo: Improve building of the w32 installer.
+ * build-aux/speedo.mk: Change name of build directory to PLAY.
+ Improve the dist-source target.
+ * build-aux/speedo/w32/gdk-pixbuf-loaders.cache: Add a blank
+ line (plus comment).
+ * build-aux/speedo/w32/inst.nsi: Change name of file to gnupg-w32-*.
+ Install more tools.
+
+2014-06-10 Werner Koch <wk at gnupg.org>
+
+ speedo: Revamped speedo and include a w32 installer.
+ * build-aux/speedo/: New.
+ * build-aux/speedo/w32/: New.
+
+ build: Add more options to autogen.sh.
+ * autogen.sh: Add options --print-host and --print-build.
+
+ w32: Fix build problem with dirmngr.
+ * dirmngr/ks-engine-hkp.c (EAI_SYSTEM) [W32]: Add replacement
+ constant.
+
+ gpg: Use more specific reason codes for INV_RECP.
+ * g10/pkclist.c (find_and_check_key, build_pk_list): Use more specific
+ reasons codes for INV_RECP.
+
+2014-06-06 Werner Koch <wk at gnupg.org>
+
+ Improve the beta number generation.
+ * autogen.sh: Add option --find-version
+ * configure.ac: Rework the setting of the mym4_ variables.
+
+2014-06-05 Werner Koch <wk at gnupg.org>
+
+ Remove keyserver helper code.
+ * configure.ac: Remove keyserver helper related stuff.
+ * Makefile.am (SUBDIRS): Remove keyserver.
+ * keyserver/Makefile.am: Remove.
+
+ gpg: Require confirmation for --gen-key with experimental curves.
+ * g10/keygen.c (ask_curve): Add arg both. Require confirmation for
+ Curve25519.
+
+ gpg: Auto-migrate existing secring.gpg.
+ * g10/migrate.c: New.
+ * g10/import.c (import_old_secring): New.
+ (import_one): Add arg silent.
+ (transfer_secret_keys): Add arg batch.
+ (import_secret_one): Add args batch and for_migration.
+ * g10/gpg.c (main): Call migration function.
+
+2014-06-04 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Fix commit be07ed65.
+ * sm/server.c (option_handler): Use "with-secret".
+
+2014-06-03 Werner Koch <wk at gnupg.org>
+
+ Add new option --with-secret.
+ * g10/gpg.c: Add option --with-secret.
+ * g10/options.h (struct opt): Add field with_secret.
+ * g10/keylist.c (public_key_list): Pass opt.with_secret to list_all
+ and list_one.
+ (list_all, list_one): Add arg mark_secret.
+ (list_keyblock_colon): Add arg has_secret.
+ * sm/gpgsm.c: Add option --with-secret.
+ * sm/server.c (option_handler): Add option "with-secret".
+ * sm/gpgsm.h (server_control_s): Add field with_secret.
+ * sm/keylist.c (list_cert_colon): Take care of with_secret. Also move
+ the token string from the wrong field 14 to 15.
+
+ gpgsm: New commands --export-secret-key-{p8,raw}
+ * sm/gpgsm.c: Add new commands.
+ * sm/minip12.c (build_key_sequence): Add arg mode.
+ (p12_raw_build): New.
+ * sm/export.c (export_p12): Add arg rawmode. Call p12_raw_build.
+ (gpgsm_p12_export): Ditto.
+ (print_short_info): Print the keygrip.
+
+2014-06-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid NULL-deref in default key listing.
+ * g10/keyid.c (hash_public_key): Take care of NULL keys.
+ * g10/misc.c (pubkey_nbits): Ditto.
+
+ gpg: Simplify default key listing.
+ * g10/mainproc.c (list_node): Rework.
+
+ gpg: Graceful skip reading of corrupt MPIs.
+ * g10/parse-packet.c (mpi_read): Change error message on overflow.
+
+ gpgsm: Handle re-issued CA certificates in a better way.
+ * sm/certchain.c (find_up_search_by_keyid): Consider all matching
+ certificates.
+ (find_up): Add some debug messages.
+
+ gpgsm: Add a way to save a found state.
+ * kbx/keybox-defs.h (keybox_found_s): New.
+ (keybox_handle): Factor FOUND out to above. Add saved_found.
+ * kbx/keybox-init.c (keybox_release): Release saved_found.
+ (keybox_push_found_state, keybox_pop_found_state): New.
+
+ * sm/keydb.c (keydb_handle): Add field saved_found.
+ (keydb_new): Init it.
+ (keydb_push_found_state, keydb_pop_found_state): New.
+
+ gpg: Fix bug parsing a zero length user id.
+ * g10/getkey.c (get_user_id): Do not call xmalloc with 0.
+
+ * common/xmalloc.c (xmalloc, xcalloc): Take extra precaution not to
+ pass 0 to the arguments.
+
+2014-05-19 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Print certificates on failed TLS verification.
+ * dirmngr/ks-engine-hkp.c (cert_log_cb): New.
+ (send_request): Set callback.
+
+ http: Add callback to help logging of server certificates.
+ * common/http.c (http_session_s): Add field cert_log_cb.
+ (http_session_set_log_cb): New.
+ (http_verify_server_credentials): Call callback.
+
+2014-05-16 Werner Koch <wk at gnupg.org>
+
+ keyserver: Improve support for hkps pools.
+ * dirmngr/ks-engine-hkp.c (hostinfo_s): Add fields cname, v4addr, and
+ v6addr.
+ (create_new_hostinfo): Clear them.
+ (my_getnameinfo): Add args numeric and r_isnumeric.
+ (is_ip_address): New.
+ (map_host): Add arg r_host. Rewrite the code to handle pools in a
+ special way.
+ (ks_hkp_print_hosttable): Change format of help info output.
+ (make_host_part): Add arg optional r_httphost.
+ (send_request): Add arg httphost.
+ (ks_hkp_search, ks_hkp_get, ks_hkp_put): Get httphost and pass it to
+ send_request.
+
+ http: Allow overriding of the Host header.
+ * common/http.c (http_open): Add arg httphost.
+ (http_open_document): Pass NULL for httphost.
+ (send_request): Add arg httphost. If given, use HTTPHOST instead of
+ SERVER. Use https with a proxy if requested.
+ (http_verify_server_credentials): Do not stop at the first error
+ message.
+ * dirmngr/ocsp.c (do_ocsp_request): Adjust call to http_open.
+ * keyserver/curl-shim.c (curl_easy_perform): Ditto.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_help): Ditto.
+
+2014-05-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix uninitialized access to search descindex with gpg keyboxes.
+ * kbx/keybox-search.c (keybox_search): Add arg R_DESCINDEX. Chnage
+ both callers.
+ * g10/keydb.c (keydb_search): Always set DESCINDEX.
+
+ w32: Make make_absfilename work with drive letters.
+ * common/stringhelp.c (do_make_filename) [HAVE_DRIVE_LETTERS]: Fix.
+
+ gpg: Remove useless diagnostic in MDC verification.
+ * g10/decrypt-data.c (decrypt_data): Do not distinguish between a bad
+ MDC packer header and a bad MDC.
+
+ gpg: Fix glitch entering a full expiration time.
+ * g10/keygen.c (ask_expire_interval): Get the current time after the
+ prompt.
+
+2014-05-08 Werner Koch <wk at gnupg.org>
+
+ agent: Fix import of non-protected gpg keys.
+ * agent/cvt-openpgp.c (do_unprotect): Return an s-exp also for
+ non-protected keys.
+ (convert_from_openpgp_main): Do not call agent_askpin for a
+ non-protected key.
+
+ Make more use of *_NAME macros.
+ * configure.ac (GPG_DISP_NAME, GPGSM_DISP_NAME): New.
+ (GPG_AGENT_DISP_NAME, SCDAEMON_DISP_NAME): New.
+ (DIRMNGR_DISP_NAME, G13_DISP_NAME): New.
+ (GPGCONF_DISP_NAME): New.
+ (SCDAEMON_SOCK_NAME): New.
+ * common/argparse.c (show_help): Map description string.
+
+2014-05-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix auth key comment handling.
+ * agent/command-ssh.c (ssh_send_key_public): Handle the case with no
+ comment.
+
+2014-05-07 Werner Koch <wk at gnupg.org>
+
+ Make -jN work again.
+ * common/Makefile.am ($(PROGRAMS)): New rule
+ (t_http_LDADD): Use libcommontls.a without directory prefix.
+ * dirmngr/Makefile.am ($(PROGRAMS)): New rule.
+
+ gpg: Print the key algorithm/curve with signature info.
+ * g10/mainproc.c (check_sig_and_print): Print the name and curve.
+
+ gpg: Fix memleak in signature verification of bogus keys.
+ * g10/mainproc.c (check_sig_and_print): Factor common code out to ...
+ (print_good_bad_signature): here.
+
+ gpg: Mark experimental algorithms in the key listing.
+ * g10/keylist.c (list_keyblock_print): Remove duplicate curve name.
+ Print a note for experimental algorithms.
+ * g10/misc.c (print_pubkey_algo_note): Fix warning message.
+
+ gpg: Finish experimental support for Ed25519.
+ * agent/cvt-openpgp.c (try_do_unprotect_arg_s): Add field "curve".
+ (get_keygrip): Add and use arg CURVE.
+ (convert_secret_key): Ditto.
+ (convert_transfer_key): Ditto.
+ (get_npkey_nskey): New.
+ (prepare_unprotect): Replace gcrypt functions by
+ get_npkey_nskey. Allow opaque MPIs.
+ (do_unprotect): Use CURVE instead of parameters.
+ (convert_from_openpgp_main): Ditto.
+ (convert_to_openpgp): Simplify.
+ * g10/import.c (one_mpi_from_pkey): Remove.
+ (transfer_secret_keys): Rewrite to use the curve instead of the
+ parameters.
+ * g10/parse-packet.c (parse_key): Mark protected MPIs with USER1 flag.
+
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Allow the use of
+ "NIST P-256" et al.
+ * g10/keygen.c (ask_curve): Add arg ALGO.
+ (generate_keypair): Rewrite the ECC key logic.
+
+ * tests/openpgp/ecc.test: Provide the "ecc" passphrase.
+
+ kbx: Add experimental support for EDDSA.
+ * kbx/keybox-openpgp.c (parse_key): Use algo constants and add
+ experimental support for EdDSA.
+
+ agent: Remove greeting message.
+ * agent/gpg-agent.c (main): Remove greeting. Make --no-greeting a
+ dummy.
+
+2014-05-06 Werner Koch <wk at gnupg.org>
+
+ Use "samethread" mode keyword for some es_fopenmem.
+ * dirmngr/ks-engine-hkp.c (armor_data): Add mode keyword.
+ * g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
+ * scd/atr.c (atr_dump): Ditto.
+
+2014-05-05 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Add support for hkps keyservers.
+ * dirmngr/dirmngr.c: Include gnutls.h.
+ (opts): Add --gnutls-debug and --hkp-cacert.
+ (opt_gnutls_debug, my_gnutls_log): New.
+ (set_debug): Set gnutls log level.
+ (parse_rereadable_options): Register a CA file.
+ (main): Init GNUTLS.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_help): Support hkps.
+ (send_request): Ditto.
+
+ http: Add reference counting to the session object.
+ * common/http.c (http_session_t): Add field "refcount".
+ (_my_socket_new, _my_socket_ref, _my_socket_unref): Add debug code.
+ (send_request, my_npth_read, my_npth_write): Use SOCK object for the
+ transport ptr.
+ (http_session_release): Factor all code out to ...
+ (session_unref): here. Deref SOCK.
+ (http_session_new): Init refcount and transport ptr.
+ (http_session_ref): New. Ref and unref all assignments.
+
+2014-05-02 Werner Koch <wk at gnupg.org>
+
+ http: Add HTTP_FLAG_FORCE_TLS and http_get_tls_info.
+ * common/http.c (http_parse_uri): Factor code out to ...
+ (parse_uri): here. Add arg FORCE_TLS.
+ (do_parse_uri): Ditto. Implement flag.
+ (http_get_tls_info): New.
+ (http_register_tls_ca): Allow clearing of the list.
+ (send_request): Use a default verification function.
+ * common/http.h (HTTP_FLAG_FORCE_TLS): New.
+ * common/t-http.c (main): Add several command line options.
+
+ common: Fix test for openpgp_oid_is_ed25519.
+ * common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): Add correct
+ value.
+
+ http: Revamp TLS API.
+ * configure.ac (NEED_GNUTLS_VERSION): New.
+ (HTTP_USE_GNUTLS, LIBGNUTLS_CFLAGS, LIBGNUTLS_LIBS): New ac_subst.
+
+ * common/http.h (http_session_t): New.
+ * common/http.c: Remove compatibility for gnutls < 3.0.
+ (http_session_s): New.
+ (cookie_s): Replace gnutls_session_t by http_session_t.
+ (tls_callback, tls_ca_certlist): New variables.
+ (my_socket_unref): Add preclose args.
+ (my_npth_read, my_npth_write): New.
+ (make_header_line): Fix bug using int* instead of char*.
+ (http_register_tls_callback): New.
+ (http_register_tls_ca): New.
+ (http_session_new): New.
+ (http_session_release): New.
+ (http_get_header_names): New.
+ (escape_data): Add hack to escape in forms mode.
+ (send_request) [HTTP_USE_GNUTLS]: Support SNI.
+ (send_request) [HTTP_USE_GNUTLS]: Fix use of make_header_line.
+ (send_gnutls_bye): New.
+ (cookie_close): Make use of preclose feature.
+ (http_verify_server_credentials): New.
+ (main) [TEST]: Remove test code.
+ * common/t-http.c: New.
+ * common/tls-ca.pem: New.
+ * common/Makefile.am (tls_sources): New. Move http code to here.
+ (libcommontls_a_SOURCES): New.
+ (libcommontlsnpth_a_SOURCES): New.
+ (EXTRA_DIST): Add tls-ca.pem
+ (module_maint_tests): Add t-http.
+ (t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
+
+ * dirmngr/Makefile.am (dirmngr_LDADD): Add libcommontlsnpth.
+
+ common: Cleanup the use of USE_NPTH and HAVE_NPTH macros.
+ * configure.ac (HAVE_NPTH): New ac_define.
+ * common/estream.c: Use USE_NPTH instead of HAVE_NPTH.
+ * common/http.c: Ditto. Replace remaining calls to pth by npth calls.
+ (connect_server): Remove useless _().
+ * common/exechelp-posix.c, common/exechelp-w32.c
+ * common/exechelp-w32ce.c: Use HAVE_PTH to include npth.h.
+ * common/init.c (_init_common_subsystems): Remove call to pth_init.
+ * common/sysutils.c (gnupg_sleep): Use npth_sleep.
+ * scd/ccid-driver.c (my_sleep): Ditto.
+
+2014-04-30 Werner Koch <wk at gnupg.org>
+
+ estream: Implement "samethread" mode keyword.
+ * src/estream.c (estream_internal): Add field SAMETHREAD.
+ (init_stream_lock, lock_stream, trylock_stream, unlock_stream): Use it.
+ (parse_mode): Add arg SAMETHREAD and parse that keyword.
+ (es_initialize): Rename to ...
+ (init_stream_obj): this. Add arg SAMETHREAD.
+ (es_create): Add arg SAMETHREAD. Call init_stream_lock after
+ init_stream_obj.
+ (doreadline): Call es_create with samethread flag.
+ (es_fopen, es_mopen, es_fopenmem, es_fopencookie, do_fdopen)
+ (do_fpopen, do_w32open): Implement "samethread" keyword.
+ (es_freopen): Take samthread flag from old stream.
+ (es_tmpfile): Call es)_create w/o samethread.
+
+ estream: Fix deadlock in es_fileno.
+ * src/estream.c (es_fileno_unlocked): Call the unlocked functions.
+
+ estream: Add debug code to the lock functions.
+ * common/estream.c (dbg_lock_0, dbg_lock_1, dbg_lock_1): New.
+
+ estream: Replace locking macros by functions.
+ * common/estream.c: Replace most macros.
+
+2014-04-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ ECC Fixes.
+ * agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
+ (convert_transfer_key): Follow newer (>= 1.6) libgcrypt API, which
+ does not distinguish the detail.
+ (do_unprotect, convert_from_openpgp_main): Don't call
+ map_pk_openpgp_to_gcry, as it's the value of libgcrypt API already and
+ not the value defined by OpenPGP.
+ (convert_to_openpgp): It's "ecc".
+ * agent/gpg-agent.c (map_pk_openpgp_to_gcry): Remove.
+ * g10/call-agent.c (agent_pkdecrypt): Fix off-by-one error.
+ * g10/pubkey-enc.c (get_it): Fix swapping the fields error.
+
+2014-04-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Pass --homedir to gpg-agent.
+ * agent/gpg-agent.c (main): Make sure homedir is absolute.
+ * common/asshelp.c (lock_spawning): Create lock file with an absolute
+ name.
+ (start_new_gpg_agent): Use an absolute name for the socket and pass
+ option --homedir to the agent.
+ (start_new_dirmngr): Use an absolute name for the --homedir.
+
+ common: Add functions make_absfilename and make_absfilename_try.
+ * common/stringhelp.c (do_make_filename): Add modes 2 and 3.
+ (make_absfilename): New.
+ (make_absfilename_try): New.
+
+ common: Add function gnupg_getcwd.
+ * tools/gpg-connect-agent.c (gnu_getcwd): Move to ...
+ * common/sysutils.c (gnupg_getcwd): .. here.
+ * tools/gpg-connect-agent.c (get_var_ext): Use gnupg_getcwd.
+
+ gpg: Print a warning if GKR has hijacked gpg-agent.
+ * g10/call-agent.c (check_hijacking): New.
+ (start_agent): Call it.
+ (membuf_data_cb, default_inq_cb): Move more to the top.
+
+2014-04-17 Werner Koch <wk at gnupg.org>
+
+ gpg: New %U expando for the photo viewer.
+ * g10/photoid.c (show_photos): Set namehash.
+ * g10/misc.c (pct_expando): Add "%U" expando.
+
+ common: Add z-base-32 encoder.
+ * common/zb32.c: New.
+ * common/t-zb32.c: New.
+ * common/Makefile.am (common_sources): Add zb82.c
+ (module_tests): Add t-zb32.
+
+2014-04-16 Werner Koch <wk at gnupg.org>
+
+ Two minor code cleanups and one NULL deref on error fix.
+ * common/estream.c (es_freopen): Remove useless check for STREAM.
+ * kbx/keybox-blob.c (_keybox_create_x509_blob): Remove useless check
+ for BLOB.
+ * tools/sockprox.c (run_proxy): Do not fclose(NULL).
+
+2014-04-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Re-enable secret key deletion.
+ * g10/call-agent.c (agent_delete_key): New.
+ * g10/keydb.h (FORMAT_KEYDESC_DELKEY): New.
+ * g10/passphrase.c (gpg_format_keydesc): Support new format.
+ * g10/delkey.c (do_delete_key): Add secret key deletion.
+
+ gpg: Re-indent a file.
+ * g10/delkey.c: Re-indent.
+ (do_delete_key, delete_keys): Change return type top gpg_error_t.
+
+ gpg: Fix regression in secret key export.
+ * agent/cvt-openpgp.c (convert_to_openpgp): Fix use
+ gcry_sexp_extract_param.
+ * g10/export.c (do_export_stream): Provide a proper prompt to the
+ agent.
+
+ gpg: Change pinentry prompt to talk about "secret key".
+ * g10/passphrase.c (gpg_format_keydesc): Add mode 2. Change strings.
+ * g10/keydb.h (FORMAT_KEYDESC_NORMAL, FORMAT_KEYDESC_IMPORT)
+ (FORMAT_KEYDESC_EXPORT): New. Use them for clarity.
+
+ agent: Add command DELETE_KEY.
+ * agent/command.c (cmd_delete_key): New.
+ * agent/findkey.c (modify_description): Add '%C' feature.
+ (remove_key_file): New.
+ (agent_delete_key): New.
+ * agent/command-ssh.c (search_control_file): Make arg R_DISABLE
+ optional.
+
+ * configure.ac: Require libgpg-error 1.13.
+
+2014-04-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: EdDSA support.
+ * scd/app-openpgp.c (KEY_TYPE_EDDSA, CURVE_ED25519): New.
+ (struct app_local_s): Add eddsa.
+ (get_algo_byte, store_fpr): Support KEY_TYPE_EDDSA.
+ (get_ecc_key_parameters, get_curve_name): Support CURVE_ED25519.
+ (send_key_attr, get_public_key): Support KEY_TYPE_EDDSA.
+ (build_ecc_privkey_template): Rename as it supports both of
+ ECDSA and EdDSA.
+ (ecc_writekey): Rename. Support CURVE_ED25519, too.
+ (do_writekey): Follow the change of ecc_writekey.
+ (do_auth): Support KEY_TYPE_EDDSA.
+ (parse_ecc_curve): Support CURVE_ED25519. Bug fix for other curves.
+ (parse_algorithm_attribute): Bug fix for ECDH. Support EdDSA.
+
+2014-04-08 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix compiler warning.
+ * common/mischelp.h (JNLIB_GCC_HAVE_PUSH_PRAGMA): New.
+ * dirmngr/dirmngr.c (handle_tick): Factor time check out to ...
+ (time_for_housekeeping_p): new.
+
+ gpgconf: Add command --launch.
+ * tools/gpgconf.c: Add command --launch.
+ * tools/gpgconf-comp.c (gc_component_launch): New.
+
+ scd: Silent compiler warnings about unused variables.
+ * scd/app-openpgp.c (build_ecdsa_privkey_template): Mark unused arg.
+ (ecdh_writekey): Mark unused args.
+
+2014-04-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Support EdDSA.
+ * agent/pksign.c (agent_pksign_do): Handle EdDSA signature.
+
+ g10: EdDSA support.
+ * g10/keyid.c (keygrip_from_pk): Compute keygrip of EdDSA key.
+ * g10/keygen.c (generate_subkeypair): Ed25519 is for EdDSA.
+ * common/openpgp-oid.c (oid_ed25519): Update.
+
+2014-04-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: EdDSA support for SSH.
+ * agent/command-ssh.c (ssh_signature_encoder_eddsa): Signature is
+ two 32-byte opaque data which should not be interpreted as number.
+
+2014-03-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Add commands --quick-sign-key and --quick-lsign-key.
+ * g10/gpg.c (main): Add commands --quick-sign-key and
+ --quick-lsign-key.
+ * g10/keyedit.c (sign_uids): Add args FP and QUICK.
+ (keyedit_quick_sign): New.
+ (show_key_with_all_names): Add arg NOWARN.
+
+ Change some keyedit functions to allow printing to arbitrary streams.
+ * common/ttyio.c (tty_print_string): Add optional arg FP. Change all
+ callers.
+ (tty_print_utf8_string2): Ditto.
+ * g10/keyedit.c (show_prefs): Ditto.
+ (show_key_with_all_names_colon): Ditto.
+ (show_names): Ditto.
+ * g10/keylist.c (print_revokers): Ditto.
+ (print_fingerprint): Ditto.
+
+2014-03-23 Werner Koch <wk at gnupg.org>
+
+ agent: Replace es_mopen by es_fopenmem for ssh.
+ * agent/command-ssh.c (ssh_read_key_public_from_blob): Use
+ es_fopenmem.
+ (ssh_handler_request_identities): Ditto.
+ (ssh_request_process): Ditto.
+
+2014-03-22 Werner Koch <wk at gnupg.org>
+
+ agent: Put ssh key type as comment into sshcontrol.
+ * agent/command-ssh.c (ssh_key_type_spec): Add field name.
+ (ssh_key_types): Add human readable names.
+ (add_control_entry): Add arg SPEC and print key type as comment.
+ (ssh_identity_register): Add arg SPEC.
+ (ssh_handler_add_identity): Add var SPEC and pass ssh_receive_key.
+
+ agent: Support the Ed25519 signature algorithm for ssh.
+ * agent/command-ssh.c (SPEC_FLAG_IS_EdDSA): New.
+ (ssh_key_types): Add entry for ssh-ed25519.
+ (ssh_identifier_from_curve_name): Move to the top.
+ (stream_read_skip): New.
+ (stream_read_blob): New.
+ (ssh_signature_encoder_rsa): Replace MPIS array by an s-exp and move
+ the s-exp parsing to here.
+ (ssh_signature_encoder_dsa): Ditto.
+ (ssh_signature_encoder_ecdsa): Ditto.
+ (ssh_signature_encoder_eddsa): New.
+ (sexp_key_construct): Rewrite.
+ (ssh_key_extract): Rename to ...
+ (ssh_key_to_blob): .. this and rewrite most of it.
+ (ssh_receive_key): Add case for EdDSA.
+ (ssh_convert_key_to_blob, key_secret_to_public): Remove.
+ (ssh_send_key_public): Rewrite.
+ (ssh_handler_request_identities): Simplify.
+ (data_sign): Add rename args. Add new args HASH and HASHLEN. Make
+ use of es_fopenmen and es_fclose_snatch. Remove parsing into MPIs
+ which is now doe in the sgnature encoder functions.
+ (ssh_handler_sign_request): Take care of Ed25519.
+ (ssh_key_extract_comment): Rewrite using gcry_sexp_nth_string.
+
+ agent: Cleanups to prepare implementation of Ed25519.
+ * agent/cvt-openpgp.c: Remove.
+ (convert_to_openpgp): Use gcry_sexp_extract_param.
+ * agent/findkey.c (is_eddsa): New.
+ (agent_is_dsa_key, agent_is_eddsa_key): Check whether ecc means EdDSA.
+ * agent/pksign.c (agent_pksign_do): Add args OVERRIDEDATA and
+ OVERRIDEDATALEN.
+
+ * common/ssh-utils.c (is_eddsa): New.
+ (get_fingerprint): Take care or EdDSA.
+
+2014-03-18 Werner Koch <wk at gnupg.org>
+
+ tools: Fix NULL deref in gpg-connect-agent.
+ * tools/gpg-connect-agent.c (handle_inquire): Do not pass NULL to
+ strlen.
+
+ dirmngr: Resurrect hosts in the HKP hosttable.
+ * dirmngr/dirmngr.c (HOUSEKEEPING_INTERVAL): New.
+ (housekeeping_thread): New.
+ (handle_tick): Call new function.
+ * dirmngr/ks-engine-hkp.c (RESURRECT_INTERVAL): New.
+ (struct hostinfo_s): Add field died_at and set it along with the dead
+ flag.
+ (ks_hkp_print_hosttable): Print that info.
+ (ks_hkp_housekeeping): New.
+
+ common: New function elapsed_time_string.
+ * common/gettime.c (elapsed_time_string): New.
+
+2014-03-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Reject signatures made with MD5.
+ * g10/gpg.c: Add option --allow-weak-digest-algos.
+ (main): Set option also in PGP2 mode.
+ * g10/options.h (struct opt): Add flags.allow_weak_digest_algos.
+ * g10/sig-check.c (do_check): Reject MD5 signatures.
+ * tests/openpgp/defs.inc: Add allow_weak_digest_algos to gpg.conf.
+
+ gpg: Make --auto-key-locate work again with keyservers.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_get): Allow exact search mode.
+ * g10/keyserver.c (keyserver_import_name): Implement.
+ (keyserver_get): Use exact mode for name based import.
+ (keyserver_get): Add args R_FPR and R_FPRLEN. Change all callers.
+
+ gpg: New mechanism "clear" for --auto-key-locate.
+ * g10/getkey.c (parse_auto_key_locate): Implement "clear".
+
+2014-03-14 Werner Koch <wk at gnupg.org>
+
+ gpg-connect-agent: Make it easier to connect to the dirmngr.
+ * tools/gpg-connect-agent.c: Add options --dirmngr and
+ --dirmngr-program.
+
+ dirmngr: Make use of IPv4 and IPV6 more explicit.
+ * common/http.c (connect_server): Handle the new flags.
+ * common/http.h (HTTP_FLAG_IGNORE_IPv4, HTTP_FLAG_IGNORE_IPv4): New.
+ * dirmngr/ks-engine-hkp.c (map_host): Add arg r_httpflags.
+ (make_host_part): Ditto.
+ (send_request): Add arg httpflags.
+ (ks_hkp_search, ks_hkp_get, ks_hkp_put): Handle httpflags.
+
+ dirmngr: Do not use brackets around legacy IP addresses.
+ * dirmngr/ks-engine-hkp.c (my_getnameinfo): Change args to take a
+ complete addrinfo. Bracket only v6 addresses. Change caller.
+
+ gpg: Print the actual used keyserver address.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_search, ks_hkp_get): Print SOURCE
+ status lines.
+ * g10/call-dirmngr.c (ks_status_parm_s): New.
+ (ks_search_parm_s): Add field stparm.
+ (ks_status_cb): New.
+ (ks_search_data_cb): Send source to the data callback.
+ (gpg_dirmngr_ks_search): Change callback prototope to include the
+ SPECIAL arg. Adjust all users. Use ks_status_cb.
+ (gpg_dirmngr_ks_get): Add arg r_source and use ks_status_cb.
+ * g10/keyserver.c (search_line_handler): Adjust callback and print
+ "data source" disgnostic.
+ (keyserver_get): Print data source diagnostic.
+
+ dirmngr: Default to a user socket name and enable autostart.
+ * common/homedir.c (dirmngr_socket_name): Rename to
+ dirmngr_sys_socket_name.
+ (dirmngr_user_socket_name): New.
+ * common/asshelp.c (start_new_dirmngr): Handle sys and user dirmngr
+ socket.
+ * dirmngr/dirmngr.c (main): Ditto.
+ * dirmngr/server.c (cmd_getinfo): Ditto.
+ * sm/server.c (gpgsm_server): Ditto.
+ * dirmngr/dirmngr-client.c (start_dirmngr): Likewise.
+ * tools/gpgconf.c (main): Print "dirmngr-sys-socket" with --list-dirs.
+
+ * configure.ac (USE_DIRMNGR_AUTO_START): Set by default.
+
+2014-03-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Add option --dirmngr-program.
+ * g10/gpg.c: Add option --dirmngr-program.
+ * g10/options.h (struct opt): Add field dirmngr_program.
+ * g10/call-dirmngr.c (create_context): Use new var.
+
+ * dirmngr/dirmngr.c: Include gc-opt-flags.h.
+ (main): Remove GC_OPT_FLAG_*.
+ * tools/gpgconf-comp.c (GC_OPT_FLAG_NO_CHANGE): Move macro to ...
+ * common/gc-opt-flags.h: here.
+
+ dirmngr: Detect dead keyservers and try another one.
+ * dirmngr/ks-action.c (ks_action_resolve): Rename var for clarity.
+ (ks_action_search, ks_action_put): Ditto.
+ (ks_action_get): Consult only the first server which retruned some
+ data.
+
+ * dirmngr/ks-engine-hkp.c (SEND_REQUEST_RETRIES): New.
+ (map_host): Add arg CTRL and call dirmngr_tick.
+ (make_host_part): Add arg CTRL.
+ (mark_host_dead): Allow the use of an URL.
+ (handle_send_request_error): New.
+ (ks_hkp_search, ks_hkp_get, ks_hkp_put): Mark host dead and retry on
+ error.
+
+ http: Add a flag to the URL parser indicating a literal v6 address.
+ * common/http.h (struct parsed_uri_t): Add field v6lit.
+ * common/http.c (do_parse_uri): Set v6lit.
+
+2014-03-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: writekey support of ECC.
+ * scd/app-openpgp.c (CURVE_SEC_P256K1, get_algo_byte): New.
+ (store_fpr): Support ECC keys with varargs.
+ (get_ecc_key_parameters, get_curve_name): Support secp256k1.
+ (parse_ecc_curve): Likewise.
+ (build_ecdsa_privkey_template, rsa_writekey, ecdsa_writekey): New.
+ (ecdh_writekey): New. Not implemented yet.
+ (do_writekey): Call rsa_writekey, ecdsa_writekey, or ecdh_writekey.
+ (do_genkey): Follow the change of store_fpr.
+
+2014-03-11 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Put brackets around IP addresses in the hosttable.
+ * dirmngr/ks-engine-hkp.c (EAI_OVERFLOW): Provide a substitute.
+ (my_getnameinfo): New.
+ (map_host): Use it.
+
+ dirmngr: Add command option to mark hosts as dead or alive.
+ * dirmngr/server.c (cmd_killdirmngr): Factor some code out to ...
+ (check_owner_permission): here.
+ (cmd_keyserver): Add options --dead and --alive.
+ * dirmngr/ks-engine-hkp.c (host_in_pool_p): New.
+ (ks_hkp_mark_host): New.
+
+ dirmngr: Make Assuan output of keyblocks easier readable.
+ * dirmngr/server.c (data_line_cookie_write): Print shorter data lines
+ in verbose mode.
+
+ dirmngr: Fix HKP host selection code.
+ * dirmngr/server.c (cmd_keyserver): Add option --resolve and change
+ --print-hosttable to --hosttable.
+ * dirmngr/ks-action.c (ks_printf_help): New.
+ (ks_action_resolve): New.
+ * dirmngr/ks-engine-hkp.c (select_random_host): Fix selection.
+ (ks_hkp_print_hosttable): Print to assuan stream.
+ (map_host): Remove debug code. Add arg FORCE_SELECT. Return numeric
+ IP addr if it can't be resolved.
+ (make_host_part): Add arg FORCE_SELECT; change callers to pass false.
+ (ks_hkp_resolve): New.
+
+ List readline support in configure summary.
+ * m4/readline.m4: Set gnupg_cv_have_readline.
+ * configure.ac: Add readline support to summary output.
+
+2014-03-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: API change of agent_key_from_file.
+ * agent/findkey.c (agent_key_from_file): Always return S-expression.
+ * agent/command.c (cmd_passwd): Distinguish by SHADOW_INFO.
+ (cmd_export_key): Likewise. Free SHADOW_INFO.
+ (cmd_keytocard): Likewise. Release S_SKEY.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Likewise.
+ * agent/pksign.c (agent_pksign_do): Likewise. Use the S-expression to
+ know the key type.
+
+2014-03-10 Werner Koch <wk at gnupg.org>
+
+ Backport useful code from fixes for bug 1447.
+ * configure.ac: Cehck for inet_ntop.
+ * m4/libcurl.m4: Provide a #define for the version of the curl
+ library.
+
+ scd: acquire lock in new_reader_slot.
+ * scd/apdu.c (new_reader_slot): Acquire lock.
+ (open_ct_reader, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
+ (open_ccid_reader, open_rapdu_reader): Release lock.
+ (lock_slot, trylock_slot, unlock_slot): Move more to the top.
+
+ Do not require libiconv for Android.
+ * configure.ac (require_iconv): New. Set to false for android.
+ (AM_ICONV): Run only if required.
+
+2014-03-07 Werner Koch <wk at gnupg.org>
+
+ dirmmgr: Use a portability wrapper for struct timeval.
+ * dirmngr/dirmngr_ldap.c [W32]: Include winber.h.
+ (my_ldap_timeval_t): New.
+
+ Silence more warnings about unused vars and args.
+ * dirmngr/cdblib.c (cdb_init) [W32]: Remove unused var.
+ * dirmngr/dirmngr-client.c (start_dirmngr): s/int/assuan_fd_t/.
+ * dirmngr/dirmngr.c (w32_service_control): Mark unused args.
+ (call_real_main): New.
+ (main) [W32]: Use new function to match prototype.
+ (real_main) [W32]: Mark unused vars.
+ (handle_signal) [W32]: Do not build the function at all.
+ (handle_connections) [W32]: Do not define signo.
+ * dirmngr/ldap-wrapper-ce.c (outstream_reader_cb): Remove used vars.
+ * g10/tdbio.c (ftruncate) [DOSISH]: Define only if not yet defined.
+
+ dirmngr: Simplify strtok macro.
+ * dirmngr/ldap-url.c (ldap_utf8_strtok): Remove unused r3d arg.
+ (ldap_str2charray): Remove lasts.
+
+ Use attribute __gnu_printf__ also in estream header files.
+ * common/estream-printf.h: Use attribute gnu_printf.
+ * common/estream.h: Ditto.
+
+ Use attribute __gnu_printf__ with our estream-printf functions.
+ * common/mischelp.h (JNLIB_GCC_A_PRINTF): Use __gnu_printf__
+ (JNLIB_GCC_A_NR_PRINTF): Ditto.
+
+ w32: Silence warnings about unused vars.
+ * agent/gpg-agent.c (main) [W32]: Mark unused vars.
+ * sm/gpgsm.c (run_protect_tool) [W32]: Ditto.
+ * g10/trustdb.c (check_regexp) [DISABLE_REGEX]: Ditto.
+ * scd/scdaemon.c (main) [W32]: Ditto.
+ (handle_connections) [W32]: Ditto.
+ (handle_signal) [W32]: Do not build the function at all.
+ * scd/apdu.c (pcsc_send_apdu_direct): Ditto.
+ (connect_pcsc_card): s/long/pcsc_dword_t/.
+ (open_pcsc_reader_direct): Remove var listlen.
+
+ w32: Fix a potential problem in gpgconf's gettext.
+ * tools/gpgconf-comp.c (my_dgettext) [USE_SIMPLE_GETTEXT]: Make sure
+ to return something even DOMAIN is not given.
+
+ Silence several warnings when building under Windows.
+ * agent/call-scd.c (start_scd): Replace int by assuan_fd_t.
+ (start_pinentry): Ditto.
+ * common/asshelp.c (start_new_gpg_agent): Replace int by assuan_fd_t.
+ * common/dotlock.c (GNUPG_MAJOR_VERSION): Include stringhelp.h for
+ prototypes on Windows and some other platforms.
+ * common/logging.c (fun_writer): Declare addrbuf only if needed.
+ * g10/decrypt.c (decrypt_message_fd) [W32]: Return not_implemented.
+ * g10/encrypt.c (encrypt_crypt) [W32]: Return error if used in server
+ mode.
+ * g10/dearmor.c (dearmor_file, enarmor_file): Replace GNUPG_INVALID_FD
+ by -1 as temporary hack for Windows.
+ * g10/export.c (do_export): Ditto.
+ * g10/revoke.c (gen_desig_revoke, gen_revoke): Ditto.
+ * g10/sign.c (sign_file, clearsign_file, sign_symencrypt_file): Ditto.
+ * g10/server.c (cmd_verify, gpg_server) [W32]: Return an error.
+
+ w32: Include winsock2.h to silence warnings.
+
+ gl: Avoid warning about shadowing an arg.
+ * gl/setenv.c (KNOWN_VALUE): s/value/_v/.
+
+ common: Fix build problem with Sun Studio compiler.
+ * common/estream.c (ESTREAM_MUTEX_UNLOCK): Use int dummy dummy
+ functions.
+ (ESTREAM_MUTEX_INITIALIZE): Ditto.
+
+ gpg: Do not require a trustdb with --always-trust.
+ * g10/tdbio.c (tdbio_set_dbname): Add arg R_NOFILE.
+ * g10/trustdb.c (trustdb_args): Add field no_trustdb.
+ (init_trustdb): Set that field.
+ (revalidation_mark): Take care of a nonexistent trustdb file.
+ (read_trust_options): Ditto.
+ (tdb_get_ownertrust): Ditto.
+ (tdb_get_min_ownertrust): Ditto.
+ (tdb_update_ownertrust): Ditto.
+ (update_min_ownertrust): Ditto.
+ (tdb_clear_ownertrusts): Ditto.
+ (tdb_cache_disabled_value): Ditto.
+ (tdb_check_trustdb_stale): Ditto.
+ (tdb_get_validity_core): Ditto.
+ * g10/gpg.c (main): Do not create a trustdb with most commands for
+ trust-model always.
+
+ gpg: Print a "not found" message for an unknown key in --key-edit.
+ * g10/keyedit.c (keyedit_menu): Print message.
+
+ gpg: Protect against rogue keyservers sending secret keys.
+ * g10/options.h (IMPORT_NO_SECKEY): New.
+ * g10/keyserver.c (keyserver_spawn, keyserver_import_cert): Set new
+ flag.
+ * g10/import.c (import_secret_one): Deny import if flag is set.
+
+ agent: Fix UPDATESTARTUPTTY for ssh.
+ * agent/command-ssh.c (setup_ssh_env): Fix env setting.
+
+ gpgv: Init Libgcrypt to avoid syslog warning.
+ * g10/gpgv.c (main): Check libgcrypt version and disable secure
+ memory.
+
+ Improve libcurl detection.
+ * m4/libcurl.m4: Do not use AC_PATH_PROG if --with-libcurl as been
+ given. Suggested by John Marshall.
+
+ gpg: Remove legacy keyserver examples from the template conf file.
+ * g10/options.skel: Update.
+
+ (cherry picked from commit f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c)
+
+ w32: Define WINVER only if needed.
+ * common/sysutils.c (WINVER): Define only if less that 5.0.
+
+ w32: Remove unused code.
+ * jnlib/w32-reg.c (write_w32_registry_string): Remove.
+
+ agent: Make --allow-mark-trusted the default.
+ * agent/gpg-agent.c (opts, main): Add option --no-allow-mark-trusted.
+ Put this option into the gpgconf-list.
+ (main): Enable opt.allow_mark_trusted by default.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Replace
+ allow-mark-trusted by no-allow-mark-trusted.
+
+ * agent/trustlist.c (agent_marktrusted): Always set the "relax" flag.
+
+ ssh: Add support for Putty.
+ * agent/gpg-agent.c [W32]: Include Several Windows header.
+ (opts): Change help text for enable-ssh-support.
+ (opts, main): Add option --enable-putty-support
+ (putty_support, PUTTY_IPC_MAGIC, PUTTY_IPC_MAXLEN): New for W32.
+ (agent_init_default_ctrl): Add and asssert call.
+ (putty_message_proc, putty_message_thread): New.
+ (handle_connections) [W32]: Start putty message thread.
+ * common/sysutils.c (w32_get_user_sid): New for W32 only
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add
+ --enable-ssh-support and --enable-putty-support. Make the
+ configuration group visible at basic level.
+ * agent/command-ssh.c (serve_mmapped_ssh_request): New for W32 only.
+
+ agent: Fix binary vs. text mode problem in ssh.
+ * agent/command-ssh.c (file_to_buffer)
+ (ssh_handler_request_identities): Open streams in binary mode.
+ (start_command_handler_ssh): Factor some code out to ..
+ (setup_ssh_env): new function.
+
+ Fix syntax error for building on APPLE.
+ * scd/pcsc-wrapper.c [__APPLE__]: Fix syntax error.
+
+ Ignore obsolete option --disable-keypad.
+ * scd/scdaemon.c (opts): Ignore --disable-keypad.
+
+ Allow marking options as ignored.
+ * jnlib/argparse.h (ARGPARSE_OPT_IGNORE): New.
+ (ARGPARSE_TYPE_MASK): New, for internal use.
+ (ARGPARSE_ignore): New.
+ * jnlib/argparse.c (optfile_parse, arg_parse): Replace remaining
+ constants by macros.
+ (optfile_parse): Implement ARGPARSE_OPT_IGNORE.
+ (arg_parse): Exclide ignore options from --dump-options.
+
+2014-03-06 Werner Koch <wk at gnupg.org>
+
+ common: Fix recent commit 55656208.
+ * common/membuf.c (get_membuf_shrink): Fix use of LEN.
+
+2014-03-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ Fix g10/trust.c.
+ * g10/trust.c (register_trusted_keyid, register_trusted_key)
+ (update_ownertrust): Call functions with tdb_.
+
+2014-02-26 Werner Koch <wk at gnupg.org>
+
+ common: Replace all macros in strusage() returned strings.
+ * common/argparse.c (writechar): Remove.
+ (writestrings): Simplify.
+ (strusage): Use map_static_macro_string.
+
+ common: New function map_static_macro_string.
+ * common/mapstrings.c: New.
+ * common/t-mapstrings.c: New.
+ * common/t-support.h (DIM, DIMof): Define if not defined.
+ * common/Makefile.am: Add new files.
+
+ common: New function get_membuf_shrink.
+ * common/membuf.c (get_membuf_shrink): New.
+
+ agent: Fixed unresolved symbol under Windows.
+ * agent/gpg-agent.c (main): s/ttyname/gnupg_ttyname/.
+
+ common: Require an installed libiconv.
+ * common/utf8conv.c: Remove dynload.h.
+ (load_libiconv): Remove. Remove all calls to it.
+
+2014-02-10 Werner Koch <wk at gnupg.org>
+
+ gpg: Silent more compiler warnings due to some configure options.
+ * g10/keygen.c (generate_keypair, gen_card_key)
+ (gen_card_key_with_backup) [!ENABLE_CARD_SUPPORT]: Mark unused args.
+
+ tests: Avoid segv if dns cert lookup is not configured.
+ * common/dns-cert.c (get_dns_cert) [!USE_DNS_CERT]: Reset return args.
+
+ gpg: Cleanup compiler warnings due to some configure options.
+ * g10/photoid.c (show_photos) [DISABLE_PHOTO_VIEWER]: Mark args as
+ unused.
+ * tools/gpgconf-comp.c (my_dgettext): Mark DOMAIN as unused if NLS is
+ not configured.
+
+ gpg: Allow building without any trust model support.
+ * configure.ac: Add option --disable-trust-models
+ (NO_TRUST_MODELS): New ac_define and am_conditional.
+ * g10/Makefile.am (trust_source): New.
+ (gpg2_SOURCES): Factor some files out to above. Add trust.c.
+ * g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
+ --import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
+ --list-trustdb, --trustdb-name, --auto-check-trustdb,
+ --no-auto-check-trustdb, and --force-ownertrust.
+ (parse_trust_model) [NO_TRUST_MODELS]: Do not build.
+ (main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
+ trustdb related option code.
+ * g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
+ "enable", and "disable".
+ * g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
+ "tru" record.
+
+ * g10/trust.c: New.
+ * g10/trustdb.c (struct key_item): Move to trustdb.h.
+ (register_trusted_keyid): Rename to tdb_register_trusted_keyid.
+ (register_trusted_key): Rename to tdb_register_trusted_key.
+ (trust_letter, uid_trust_string_fixed, trust_value_to_string)
+ (string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
+ (get_ownertrust_string, get_validity_info, get_validity_string)
+ (clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
+ (mark_usable_uid_certs): Move to trust.c and make global.
+ (is_in_klist): Move as inline to trustdb.h.
+ (trustdb_check_or_update): Rename to tdb_check_or_update
+ (revalidation_mark): Rename to tdb_revalidation_mark.
+ (get_ownertrust): Rename to tdb_get_ownertrust.
+ (get_min_ownertrust): Rename to tdb_get_min_ownertrust.
+ (update_ownertrust): Rename to tdb_update_ownertrust.
+ (clear_ownertrusts): Rename to tdb_clear_ownertrusts.
+ (cache_disabled_value): Rename to tdb_cache_disabled_value.
+ (check_trustdb_stale): Rename to tdb_check_trustdb_stale.
+ (get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
+ factor some code out to ...
+ * trust.c (get_validity): ...new.
+ (check_or_update_trustdb): New wrapper.
+ (revalidation_mark): New wrapper.
+ (get_ownertrust): New wrapper.
+ (get_ownertrust_with_min): New wrapper.
+ (update_ownertrust): New wrapper.
+ (clear_ownertrusts): New wrapper.
+ (cache_disabled_value): New wrapper.
+ (check_trustdb_stale): New wrapper.
+
+ * tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
+ of --always-trust.
+
+ tests: Handle disabled algorithms.
+ * tests/openpgp/mds.test: Skip disabled algorithms.
+ * tests/openpgp/signencrypt-dsa.test: Ditto.
+ * tests/openpgp/sigs-dsa.test: Ditto.
+
+2014-02-07 Werner Koch <wk at gnupg.org>
+
+ Silence annoying ABI change warning.
+ * configure.ac [GCC]: Pass -Wno-psabi for gcc >= 4.6. Avoid some gcc
+ option tests for gcc >= 4.6
+
+ Allow disabling of card support.
+ * configure.ac: Add option --disable-card-support. Also add
+ am_conditional and do not build scd if card support is enabled.
+
+ gpg: List only available algos in --gen-key.
+ * g10/keygen.c (ask_algo, ask_curve): Take care of GPG_USE_<algo>.
+
+ gpg: Change --print-mds to output enabled OpenPGP algos.
+ * g10/gpg.c (print_mds): Use opengpg_md_test_algo. Test also for MD5
+ availibility.
+
+ gpg: Avoid compiler warnings for disabled algos.
+ * g10/misc.c (map_cipher_openpgp_to_gcry): Add case for disabled algo.
+ (openpgp_pk_test_algo2): Ditto.
+ (map_md_openpgp_to_gcry): Ditto.
+
+2014-02-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Change format for the key size in --list-key and --edit-key.
+ * g10/gpg.c (oLegacyListMode, opts, main): Add --legacy-list-mode.
+ * g10/options.h (struct opt): Add field legacy_list_mode.
+ * g10/keydb.h (PUBKEY_STRING_SIZE): New.
+ * g10/keyid.c (pubkey_string): New.
+ * g10/import.c (import_one, import_secret_one): Use pubkey_string.
+ * g10/keylist.c (print_seckey_info): Ditto.
+ (print_pubkey_info, print_card_key_info): Ditto.
+ (list_keyblock_print): Ditto.
+ * g10/mainproc.c (list_node): Ditto.
+ * g10/pkclist.c (do_edit_ownertrust, build_pk_list): Ditto.
+ * g10/keyedit.c (show_key_with_all_names): Ditto. Also change the
+ format.
+ (show_basic_key_info): Ditto.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Also allow "ed25519".
+ (openpgp_oid_to_curve): Downcase "ed25519"
+
+2014-01-31 Werner Koch <wk at gnupg.org>
+
+ gpg: Add configure options to disable algorithms.
+ * acinclude.m4 (GNUPG_GPG_DISABLE_ALGO): New.
+ * configure.ac: Add --enable-gpg-* options to disable non MUS
+ algorithms.
+ * g10/misc.c (map_cipher_openpgp_to_gcry): Implement these options.
+ (openpgp_pk_test_algo2): Ditto.
+ (map_md_openpgp_to_gcry): Ditto.
+ (openpgp_cipher_test_algo, openpgp_md_test_algo): Simplify.
+
+ gpg: Improve --version algo info output.
+ * g10/misc.c (openpgp_pk_algo_name): Return a different string for
+ each ECC algorithm.
+ * g10/gpg.c (build_list_pk_test_algo): New wrapper to cope with the
+ different algo type enums.
+ (build_list_pk_algo_name): Ditto.
+ (build_list_cipher_test_algo): Ditto.
+ (build_list_cipher_algo_name): Ditto.
+ (build_list_md_test_algo): Ditto.
+ (build_list_md_algo_name): Ditto.
+ (my_strusage): Use them.
+ (list_config): Ditto. Add "pubkeyname".
+ (build_list): Add letter==1 hack.
+
+ gpg: Start using OpenPGP digest algo ids.
+ * g10/misc.c (print_pubkey_algo_note): Use enum typedef for the arg.
+ (print_cipher_algo_note): Ditto.
+ (print_digest_algo_note): Ditto.
+ (map_md_openpgp_to_gcry): New.
+ (openpgp_md_test_algo): Rewrite.
+ (openpgp_md_algo_name): Rewrite to do without Libgcrypt.
+ * g10/cpr.c (write_status_begin_signing): Remove hardwired list of
+ algo ranges.
+
+ gpg: Use only OpenPGP cipher algo ids.
+ * g10/misc.c (map_cipher_openpgp_to_gcry): Use explicit mapping and
+ use enums for the arg and return value.
+ (map_cipher_gcry_to_openpgp): Ditto.
+ (openpgp_cipher_blocklen): Use constant macros.
+ (openpgp_cipher_test_algo): Use mapping function and prepare to
+ disable algorithms.
+ (openpgp_cipher_algo_name): Do not use Libgcrypt.
+
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Replace
+ CGRY_CIPHER_* by CIPHER_ALGO_*.
+
+ * common/openpgpdefs.h (cipher_algo_t): Remove unused
+ CIPHER_ALGO_DUMMY.
+
+2014-01-30 Werner Koch <wk at gnupg.org>
+
+ gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id.
+ * common/sexputil.c (get_pk_algo_from_canon_sexp): Change to return a
+ string.
+ * g10/keygen.c (check_keygrip): Adjust for change.
+ * sm/certreqgen-ui.c (check_keygrip): Likewise.
+
+ * agent/pksign.c (do_encode_dsa): Remove bogus map_pk_openpgp_to_gcry.
+
+ * g10/misc.c (map_pk_openpgp_to_gcry): Remove.
+ (openpgp_pk_test_algo): Change to a wrapper for openpgp_pk_test_algo2.
+ (openpgp_pk_test_algo2): Rewrite.
+ (openpgp_pk_algo_usage, pubkey_nbits): Add support for EdDSA.
+ (openpgp_pk_algo_name): Rewrite to remove need for gcry calls.
+ (pubkey_get_npkey, pubkey_get_nskey): Ditto.
+ (pubkey_get_nsig, pubkey_get_nenc): Ditto.
+ * g10/keygen.c(do_create_from_keygrip): Support EdDSA.
+ (common_gen, gen_ecc, ask_keysize, generate_keypair): Ditto.
+ * g10/build-packet.c (do_key): Ditto.
+ * g10/export.c (transfer_format_to_openpgp): Ditto.
+ * g10/getkey.c (cache_public_key): Ditto.
+ * g10/import.c (transfer_secret_keys): Ditto.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
+ * g10/mainproc.c (proc_pubkey_enc): Ditto.
+ * g10/parse-packet.c (parse_key): Ditto,
+ * g10/sign.c (hash_for, sign_file, make_keysig_packet): Ditto.
+ * g10/keyserver.c (print_keyrec): Use openpgp_pk_algo_name.
+ * g10/pkglue.c (pk_verify, pk_encrypt, pk_check_secret_key): Use only
+ OpenPGP algo ids and support EdDSA.
+ * g10/pubkey-enc.c (get_it): Use only OpenPGP algo ids.
+ * g10/seskey.c (encode_md_value): Ditto.
+
+2014-01-29 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove cipher.h and put algo ids into a common file.
+ * common/openpgpdefs.h (cipher_algo_t, pubkey_algo_t, digest_algo_t)
+ (compress_algo_t): New.
+ * agent/gpg-agent.c: Remove ../g10/cipher.h. Add openpgpdefs.h.
+ * g10/cipher.h (DEK): Move to ...
+ * g10/dek.h: new file.
+ * g10/cipher.h (is_RSA, is_ELGAMAL, is_DSA)
+ (PUBKEY_MAX_NPKEY, PUBKEY_MAX_NSKEY, PUBKEY_MAX_NSIG, PUBKEY_MAX_NENC)
+ (PUBKEY_USAGE_SIG, PUBKEY_USAGE_ENC, PUBKEY_USAGE_CERT)
+ (PUBKEY_USAGE_AUTH, PUBKEY_USAGE_NONE): Move to
+ * g10/packet.h: here.
+ * g10/cipher.h: Remove. Remove from all files.
+ * g10/filter.h, g10/packet.h: Include dek.h.
+ * g10/Makefile.am (common_source): Remove cipher.h. Add dek.h.
+
+ include: Remove this directory.
+ * include/cipher.h: Move to ...
+ * g10/cipher.h: here.
+ * agent/gpg-agent.c: Adjust header file name.
+
+ * include/host2net.h: Move to ...
+ * common/host2net.h: here. Change license to LGPLv3/GPLv2. Adjust
+ notices to reflect that only me worked on that file.
+
+ * include/types.h: Remove.
+ * common/types.h: Include inttypes.h. Add byte typedef and comments
+ for __riscos__.
+ * common/iobuf.h: Adjust header file name.
+
+ * include/_regex.h: Remove this unused file.
+
+ * include/Makefile.am: Remove.
+ * Makefile.am (SUBDIRS): Remove "include".
+ * configure.ac (AC_CONFIG_FILES): Remove include/Makefile.
+ * include/ChangeLog-2011: Move to ...
+ * common/ChangeLog-2011.include: here.
+ * common/Makefile.am (EXTRA_DIST): Add file.
+
+ * include/zlib-riscos.h: Move this repo only file to ...
+ * g10/zlib-riscos.h: here.
+
+ * include/: Remove.
+
+2014-01-17 Werner Koch <wk at gnupg.org>
+
+ Remove unused u64 type definitions.
+ * configure.ac: Remove check for uint64 and UINT64_C.
+ * include/types.h: Remove u64 stuff.
+ * common/types.h: Ditto.
+
+2014-01-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Not remove SSH socket when already running.
+ * agent/gpg-agent.c (main): Defer setting of socket_name_ssh to avoid
+ removal of the socket when it will die in create_server_socket for
+ socket_name.
+
+ agent: Fix agent_is_eddsa_key.
+ * agent/findkey.c (agent_is_eddsa_key): Implemented.
+
+2014-01-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ Add secp256k1.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Add secp256k1.
+ (openpgp_oid_to_curve): Likewise.
+
+ * g10/keygen.c (ask_curve): Add secp256k1.
+
+2014-01-10 Werner Koch <wk at gnupg.org>
+
+ autogen.sh: Add rule for 64 bit windows.
+
+ Turn autogen.sh into a generic script.
+ * autogen.sh: Revamp.
+ * autogen.rc: New.
+ * Makefile.am (EXTRA_DIST): Add autogen.rc.
+
+ Rename scripts/ to build-aux/
+ * scripts/: Rename to build-aux/
+ * Makefile.am: Adjust accordingly.
+ * configure.ac (AC_CONFIG_AUX_DIR): Change to build-aux.
+
+2014-01-09 Werner Koch <wk at gnupg.org>
+
+ Improve the speedo make script.
+ * scripts/gpg-w32-dev/README: Remove
+ * scripts/gpg-w32-dev/GNUmakefile, scripts/gpg-w32-dev/speedo.mk:
+ Merge into ..
+ * scripts/speedo.mk: this.
+
+ gpgsplit: Allow building without zlib support.
+ * tools/gpgsplit.c [!HAVE_ZLIB]: Do not include zlib.h.
+ (handle_zlib): Build only if HAVE_ZLIB is defined.
+ (write_part): Support zlib and zip only if HAVE_ZLIB is defined.
+
+ w32: Fix backslash quoting in registry name.
+ * configure.ac (GNUPG_REGISTRY_DIR): Double backslashes.
+
+ Fix test for zlib.
+ * configure.ac (HAVE_ZLIB): Define only if found.
+
+ Add --enable-silent-rules stuff.
+ * configure.ac: Add AM_SILENT_RULES.
+
+2014-01-08 Werner Koch <wk at gnupg.org>
+
+ w32: Add macro for the registry key.
+ * configure.ac (GNUPG_REGISTRY_DIR) [W32]: New ac-define.
+ * common/homedir.c (default_homedir): Use it.
+ * common/logging.c (do_logv): Use it.
+
+2013-12-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Change --show-session-key to print the session key earlier.
+ * g10/cpr.c (write_status_strings): New.
+ (write_status_text): Replace code by a call to write_status_strings.
+ * g10/mainproc.c (proc_encrypted): Remove show_session_key code.
+ * g10/decrypt-data.c (decrypt_data): Add new show_session_key code.
+
+2013-12-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Change OID of Ed25519 and add Brainpool oids.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Change OID for
+ Ed25519. Add brainpool OIDs.
+ (openpgp_oid_to_curve): Ditto.
+
+2013-11-29 Werner Koch <wk at gnupg.org>
+
+ common: Add put_membuf_printf.
+ * common/membuf.c (put_membuf_printf): New.
+
+2013-11-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Change armor Version header to emit only the major version.
+ * g10/options.h (opt): Rename field no_version to emit_version.
+ * g10/gpg.c (main): Init opt.emit_vesion to 1. Change --emit-version
+ to bump up opt.emit_version.
+ * g10/armor.c (armor_filter): Implement different --emit-version
+ values.
+
+2013-11-18 Werner Koch <wk at gnupg.org>
+
+ Make use of the *_NAME etc macros.
+ Replace hardwired strings at many places with new macros from config.h
+ and use the new strusage macro replacement feature.
+
+ * common/asshelp.c (lock_spawning) [W32]: Change the names of the spawn
+ sentinels.
+ * agent/command.c (cmd_import_key): Use asprintf to create the prompt.
+
+ Add strusage macro replacement feature.
+ * common/argparse.c (writechar): New.
+ (writestrings): Add macro replacement feature.
+ (show_help): Remove specialized @EMAIL@ replacement.
+ * configure.ac (GNUPG_NAME, GPG_NAME, GPGSM_NAME): Define.
+ (GPG_AGENT_NAME, DIRMNGR_NAME, G13_NAME, GPGCONF_NAME): Define.
+ (GPGTAR_NAME, GPG_AGENT_INFO_NAME, GPG_AGENT_SOCK_NAME): Define.
+ (GPG_AGENT_SSH_SOCK_NAME, DIRMNGR_INFO_NAME): Define.
+ (DIRMNGR_SOCK_NAME): Define.
+
+2013-11-15 Werner Koch <wk at gnupg.org>
+
+ kbx: Implement update operation for OpenPGP keyblocks.
+ * kbx/keybox-update.c (keybox_update_keyblock): Implement.
+ * kbx/keybox-search.c (get_blob_flags): Move to ...
+ * kbx/keybox-defs.h (blob_get_type): here.
+ * kbx/keybox-file.c (_keybox_read_blob2): Fix calling without R_BLOB.
+ * g10/keydb.c (build_keyblock_image): Allow calling without
+ R_SIGSTATUS.
+ (keydb_update_keyblock): Implement for keybox.
+
+ * kbx/keybox-dump.c (_keybox_dump_blob): Fix printing of the unhashed
+ size. Print "does not expire" also on 64 bit platforms.
+
+ gpg: Rework ECC support and add experimental support for Ed25519.
+ * agent/findkey.c (key_parms_from_sexp): Add algo name "ecc".
+ (agent_is_dsa_key): Ditto.
+ (agent_is_eddsa_key): New. Not finished, though.
+ * agent/pksign.c (do_encode_eddsa): New.
+ (agent_pksign_do): Use gcry_log_debug functions.
+ * agent/protect.c (agent_protect): Parse a flags parameter.
+ * g10/keygen.c (gpg_curve_to_oid): Move to ...
+ * common/openpgp-oid.c (openpgp_curve_to_oid): here and rename.
+ (oid_ed25519): New.
+ (openpgp_oid_is_ed25519): New.
+ (openpgp_oid_to_curve): New.
+ * common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): New.
+ * g10/build-packet.c (gpg_mpi_write): Write the length header also for
+ opaque MPIs.
+ (gpg_mpi_write_nohdr): New.
+ (do_key): Use gpg_mpi_write_nohdr depending on algorithm.
+ (do_pubkey_enc): Ditto.
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Use
+ gpg_mpi_write_nohdr.
+ * g10/export.c (transfer_format_to_openpgp):
+ * g10/keygen.c (ecckey_from_sexp): Return the error.
+ (gen_ecc): Repalce arg NBITS by CURVE.
+ (read_parameter_file): Add keywords "Key-Curve" and "Subkey-Curve".
+ (ask_curve): New.
+ (generate_keypair, generate_subkeypair): Use ask_curve.
+ (do_generate_keypair): Also pass curve name.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Print
+ curve name.
+ * g10/parse-packet.c (mpi_read): Remove workaround for
+ Libcgrypt < 1.5.
+ (parse_key): Fix ECC case. Print the curve name.
+ * g10/pkglue.c (mpi_from_sexp): Rename to get_mpi_from_sexp.
+ (pk_verify, pk_check_secret_key): Add special case for Ed25519.
+ * g10/seskey.c (encode_md_value): Ditto.
+ * g10/sign.c (do_sign, hash_for, sign_file): Ditto.
+
+ kbx: Fix possible segv in kbxdump.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Check length before get32.
+
+ Require Libgcrypt 1.6.
+ * agent/pksign.c (do_encode_dsa): Remove Libgcrypt version check
+
+2013-11-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: more pinpad input fix for PC/SC.
+ * scd/apdu.c (check_pcsc_pinpad): Set default values here.
+ (pcsc_pinpad_verify, pcsc_pinpad_modify): Remove setting default
+ values, as it's too late.
+
+2013-11-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: more pinpad fix.
+ * scd/apdu.c (check_pcsc_pinpad): Set ->minlen and ->maxlen only when
+ those are specified.
+ (pcsc_pinpad_modify): Remove old check code.
+
+2013-10-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: pinpad fix for PC/SC on Windows.
+ * scd/apdu.c (SCARD_CTL_CODE): Fix for Windows.
+
+2013-10-28 Werner Koch <wk at gnupg.org>
+
+ doc: Change yat2m to allow arbitrary condition names.
+ * doc/yat2m.c (MAX_CONDITION_NESTING): New.
+ (gpgone_defined): Remove.
+ (condition_s, condition_stack, condition_stack_idx): New.
+ (cond_is_active, cond_in_verbatim): New.
+ (add_predefined_macro, set_macro, macro_set_p): New.
+ (evaluate_conditions, push_condition, pop_condition): New.
+ (parse_file): Rewrite to use the condition stack.
+ (top_parse_file): Set prefined macros.
+ (main): Change -D to define arbitrary macros.
+
+2013-10-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: fix pinpad input on Windows.
+ * scd/apdu.c (open_pcsc_reader_direct): Don't call
+ pcsc_vendor_specific_init here, but...
+ (connect_pcsc_card): Call it here.
+
+2013-10-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2013-10-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: add pinpad readers information for PC/SC service.
+ * scd/apdu.c (pcsc_vendor_specific_init): Add information for Cherry
+ ST-2xxx, Reiner cyberJack, Vasco DIGIPASS, FSIJ Gnuk Token, and KAAN
+ Advance.
+
+2013-10-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: remove pin length check.
+ * scd/apdu.c (pcsc_pinpad_verify): Remove old check code for pin
+ length.
+
+2013-10-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Limit the nesting level of I/O filters.
+ * common/iobuf.c (MAX_NESTING_FILTER): New.
+ (iobuf_push_filter2): Limit the nesting level.
+
+ * g10/mainproc.c (mainproc_context): New field ANY. Change HAVE_DATA
+ and ANY_SIG_SIGN to bit fields of ANY. Add bit field
+ UNCOMPRESS_FAILED.
+ (proc_compressed): Avoid printing multiple Bad Data messages.
+ (check_nesting): Return GPG_ERR_BAD_DATA instead of UNEXPECTED_DATA.
+
+2013-10-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix bug with deeply nested compressed packets.
+ * g10/mainproc.c (MAX_NESTING_DEPTH): New.
+ (proc_compressed): Return an error code.
+ (check_nesting): New.
+ (do_proc_packets): Check packet nesting depth. Handle errors from
+ check_compressed.
+
+2013-09-08 Werner Koch <wk at gnupg.org>
+
+ Switch to deterministic DSA.
+ * agent/pksign.c (rfc6979_hash_algo_string): New.
+ (do_encode_dsa) [Libgcrypt >= 1.6]: Make use of RFC-6979.
+
+2013-08-30 Werner Koch <wk at gnupg.org>
+
+ scd: Suppress gcc warning about possible uninitialized use.
+ * scd/app-nks.c (parse_pwidstr): Always init r_pwid.
+
+ gpg: Use 2048 as the default keysize in batch mode.
+ * g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
+ 2048.
+
+ gpgtar: Fix building for systems with a separate libintl.
+ * tools/Makefile.am (gpgtar_LDADD): Add LIBINTL and LIBICONV.
+
+ scd: Use vendor and product id macros also in apdu.c.
+ * scd/ccid-driver.c: Move vendor and product ids to ...
+ * scd/ccid-driver.h: here.
+ * scd/apdu.c (CCID_DRIVER_INCLUDE_USB_IDS): Define to include ids.
+ (pcsc_vendor_specific_init): Use vendor and product id macros.
+
+2013-08-30 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC pinpad input improvement.
+ * scd/apdu.c (struct reader_table_s): Add members: PINMIN, PINMAX, and
+ PINPAD_VERLEN_SUPPORTED.
+ (CM_IOCTL_VENDOR_IFD_EXCHANGE, FEATURE_GET_TLV_PROPERTIES,
+ PCSCv2_PART10_PROPERTY_*): New.
+ (new_reader_slot): Initialize pinpad_varlen_supported, pinmin, pinmax.
+ (pcsc_vendor_specific_init): New.
+ (open_pcsc_reader_direct, open_pcsc_reader_wrapped): Call
+ pcsc_vendor_specific_init.
+ (check_pcsc_pinpad): Not detect here but use the result of
+ pcsc_vendor_specific_init.
+ (pcsc_pinpad_verify, pcsc_pinpad_modify): Specify bNumberMessage.
+
+2013-08-29 Jonas Borgström <jonas at borgstrom.se>
+
+ scd: add support for RSA_CRT and RSA_CRT_N key import.
+ * scd/app-openpgp.c (do_writekey): Added RSA_CRT and RSA_CRT_N support.
+
+2013-08-29 Werner Koch <wk at gnupg.org>
+
+ kbx: Add a few macros for easier readability.
+ * kbx/keybox-update.c (FILECOPY_INSERT)
+ (FILECOPY_DELETE, FILECOPY_UPDATE): New macros. Replace numbers by
+ them.
+
+2013-08-28 Werner Koch <wk at gnupg.org>
+
+ Fix commit 04e2c83f.
+ * agent/command-ssh.c (stream_read_string): Do not assign to a NULL
+ ptr.
+
+ gpg: Make decryption with the OpenPGP card work.
+ * scd/app-common.h (APP_DECIPHER_INFO_NOPAD): New.
+ * scd/app-openpgp.c (do_decipher): Add arg R_INFO.
+ * scd/app-nks.c (do_decipher): Add arg R_INFO as a dummy.
+ * scd/app.c (app_decipher): Add arg R_INFO.
+ * scd/command.c (cmd_pkdecrypt): Print status line "PADDING".
+ * agent/call-scd.c (padding_info_cb): New.
+ (agent_card_pkdecrypt): Add arg R_PADDING.
+ * agent/divert-scd.c (divert_pkdecrypt): Ditto.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Ditto.
+ * agent/command.c (cmd_pkdecrypt): Print status line "PADDING".
+ * g10/call-agent.c (padding_info_cb): New.
+ (agent_pkdecrypt): Add arg R_PADDING.
+ * g10/pubkey-enc.c (get_it): Use padding info.
+
+ agent: Fix two compiler warnings.
+ * agent/command.c (cmd_preset_passphrase, pinentry_loopback): Use %zu
+ in format string.
+ * scd/ccid-driver.c (ccid_get_atr): Ditto.
+ * agent/command-ssh.c (stream_read_string): Init arg STRING_SIZE to
+ avoid maybe_unitialized warning.
+
+2013-08-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: fix parsing login-data DO.
+ * scd/app-openpgp.c (parse_login_data): Release RELPTR. Fix parsing.
+
+ scd: fix Vega for Alpha reader.
+ * scd/ccid-driver.c (ccid_vendor_specific_init): Fix error handling
+ and size of command.
+
+2013-08-21 Werner Koch <wk at gnupg.org>
+
+ scd: Make SPRx32 pinpad work with PC/SC on Windows.
+ * scd/apdu.c (CM_IOCTL_GET_FEATURE_REQUEST): Use SCARD_CTL_CODE.
+ (SCARD_CTL_CODE): Define if not defined.
+ (reader_table_s): Add is_spr532.
+ (new_reader_slot): Clear it.
+ (check_pcsc_pinpad): Set it.
+ (pcsc_pinpad_verify, pcsc_pinpad_modify): Add fix for SPR532.
+
+ scd: Improve --enable-pinpad-varlen.
+ * tools/gpgconf-comp.c (gc_options_scdaemon): Add
+ enable-pinpad-varlen.
+ * scd/apdu.c (check_pcsc_pinpad): Detect SPRx32 reader.
+
+2013-08-08 Werner Koch <wk at gnupg.org>
+
+ agent: Extend cmd KEYINFO to return data from sshcontrol.
+ * agent/command-ssh.c (struct control_file_s): Rename to
+ ssh_control_file_s.
+ (ssh_open_control_file, ssh_close_control_file)
+ (ssh_read_control_file, ssh_search_control_file): New.
+ (control_file_t): Rename and move to ...
+ * agent/agent.h (ssh_control_file_t): here.
+ * agent/command.c (do_one_keyinfo): Add args is_ssh, ttl, disabled,
+ and confirm. Rename unknown keytype indicator from '-' to 'X'. Extend
+ output.
+ (cmd_keyinfo): Add options --ssh-list and --with-ssh.
+
+2013-08-02 Werner Koch <wk at gnupg.org>
+
+ gpg: No need to create a trustdb when encrypting with --always-trust.
+ * g10/gpg.c (main): Special case setup_trustdb for --encrypt.
+
+2013-08-01 Werner Koch <wk at gnupg.org>
+
+ w32: Fix recent patch 9ff72e4.
+ * common/homedir.c (check_portable_app): Fix the name of the control
+ file.
+
+ agent: Include missing prototype.
+ * agent/protect.c: Include cvt-openpgp.h.
+
+ w32: Add code to support a portable use of GnuPG.
+ * common/homedir.c (w32_bin_is_bin, w32_portable_app) [W32]: New.
+ (check_portable_app) [W32]: New.
+ (standard_homedir, default_homedir) [W32]: Support the portable flag.
+ (w32_rootdir, w32_commondir) [W32]: Ditto.
+ (gnupg_bindir, gnupg_cachedir, dirmngr_socket_name) [W32]: Ditto.
+ * common/logging.h (JNLIB_LOG_NO_REGISTRY): New.
+ * common/logging.c (no_registry): New variable.
+ (log_set_prefix, log_get_prefix): Set/get that variable.
+ (do_logv): Do not check the registry if that variable is set.
+
+ Silence compiler warning about deprecated Libgcrypt symbols.
+ * configure.ac (AH_BOTTOM): Define GCRYPT_NO_DEPRECATED.
+
+ dirmngr: Define missing LDAP constant.
+ * dirmngr/ldap-url.c (LDAP_SCOPE_DEFAULT): Define if missing.
+
+ scd: Fix a syntax error for Apple and Windows.
+ * scd/apdu.c (pcsc_dword_t) [W32]: Fix syntax error.
+
+ common: Fix a build error when using adns.
+ * common/dns-cert.c (get_dns_cert) [USE_ADNS]: Fix synatx error.
+
+2013-07-31 Werner Koch <wk at gnupg.org>
+
+ common: Comment out unused code.
+ * common/w32-reg.c (write_w32_registry_string): Comment out.
+
+ dirmngr: Remove unused file.
+ * dirmngr/get-path.c: Remove.
+
+2013-06-27 Werner Koch <wk at gnupg.org>
+
+ sm: Remove cruft from source files.
+ * sm/keydb.c, sm/keydb.h: Remove disabled code parts.
+
+ Prepare for newer automake versions.
+ * configure.ac (AM_INIT_AUTOMAKE): Replace 2 argument form by the
+ option form. Add options from the top Makefile.
+ (AM_CONFIG_HEADER): Rename to AC_CONFIG_HEADER.
+ * Makefile.am (AUTOMAKE_OPTIONS): Remove.
+
+ * kbx/Makefile.am: Remove INCLUDES. Include cmacros.am. FActor some
+ AM_CPPFLAGS options to AM_CFLAGS.
+
+2013-06-26 Werner Koch <wk at gnupg.org>
+
+ Fix Makefile regression.
+ * agent/Makefile.am (gpg_agent_DEPENDENCIES): Remove cruft from wrong
+ resolve conflict 2013-04-25.
+ (gpg_agent_DEPENDENCIES): Remove obsolete gpg_agent_res_deps
+ (gpg_agent_LDFLAGS): Remove obsolete gpg_agent_res_ldflags.
+
+2013-05-22 Werner Koch <wk at gnupg.org>
+
+ Implement unattended OpenPGP secret key import.
+ * agent/command.c (cmd_import_key): Add option --unattended.
+ * agent/cvt-openpgp.c (convert_transfer_key): New.
+ (do_unprotect): Factor some code out to ...
+ (prepare_unprotect): new function.
+ (convert_from_openpgp): Factor all code out to ...
+ (convert_from_openpgp_main): this. Add arg 'passphrase'. Implement
+ openpgp-native protection modes.
+ (convert_from_openpgp_native): New.
+ * agent/t-protect.c (convert_from_openpgp_native): New dummy fucntion
+ * agent/protect-tool.c (convert_from_openpgp_native): Ditto.
+ * agent/protect.c (agent_unprotect): Add arg CTRL. Adjust all
+ callers. Support openpgp-native protection.
+ * g10/call-agent.c (agent_import_key): Add arg 'unattended'.
+ * g10/import.c (transfer_secret_keys): Use unattended in batch mode.
+
+ New debug functions log_printcanon and log_printsexp.
+ * common/sexputil.c (sexp_to_string, canon_sexp_to_string): New.
+ (log_printcanon, log_printsexp): New.
+
+ agent: Fix length detection of canonical formatted openpgp keys.
+ * agent/command.c (cmd_import_key): Pass 0 instead of KEYLEN to
+ gcry_sexp_canon_len.
+
+ agent: New option --disable-check-own-socket.
+ * agent/gpg-agent.c (oDisableCheckOwnSocket): New.
+ (disable_check_own_socket): New.
+ (parse_rereadable_options): Set new option.
+ (check_own_socket): Implement new option.
+
+2013-05-07 Werner Koch <wk at gnupg.org>
+
+ w32: Add icons and version information.
+ * common/gnupg.ico: New. Take from artwork/gnupg-favicon-1.ico.
+ * agent/gpg-agent-w32info.rc: New.
+ * g10/gpg-w32info.rc: New.
+ * scd/scdaemon-w32info.rc: New.
+ * sm/gpgsm-w32info.rc: New.
+ * tools/gpg-connect-agent-w32info.rc: New.
+ * common/w32info-rc.h.in: New.
+ * configure.ac (BUILD_REVISION, BUILD_FILEVERSION, BUILD_TIMESTAMP)
+ (BUILD_HOSTNAME): New.
+ (AC_CONFIG_FILES): Add w32info-rc.h.
+ * am/cmacros.am (.rc.o): New rule.
+ * agent/Makefile.am, common/Makefile.am, g10/Makefile.am
+ * scd/Makefile.am, sm/Makefile.am, tools/Makefile.am: Add stuff to
+ build resource files.
+
+2013-05-07 Ian Abbott <abbotti at mev.co.uk>
+
+ doc: fix some Texinfo warnings.
+ * doc/gpg.texi: Fix syntax and add missing menu entries.
+ * doc/gpgsm.texi: Fix subsectioning.
+
+2013-04-22 Werner Koch <wk at gnupg.org>
+
+ Fix potential heap corruption in "gpg -v --version".
+ * g10/gpg.c (build_list): Rewrite to cope with buffer overflow in
+ certain locales.
+
+2013-04-19 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Remove non-implemented commands from --help.
+ * sm/gpgsm.c (opts): Removed commands --clearsign, --symmetric,
+ --send-keys, and --recv-keys.
+
+2013-04-19 Daiki Ueno <ueno at gnu.org>
+
+ Make sure to call fflush if estream_t is backed with stdio.
+ * common/estream.c (es_func_fp_write): Call fflush after fwrite.
+
+2013-04-19 Werner Koch <wk at gnupg.org>
+
+ doc: Formatting fixes.
+ * doc/Makefile.am (.fig.jpg): Correct to use -L jpeg.
+ * doc/gpg.texi: Fix cross reference for --options.
+ * doc/gpgsm.texi: Likewise.
+ * doc/gpl.texi: Fix enumerate and re-indent examples.
+
+2013-04-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: move SCDaemon to libexecdir.
+ * common/homedir.c (gnupg_module_name): It's now libexecdir.
+ * scd/Makefile.am (libexec_PROGRAMS): Add scdaemon
+ (bin_PROGRAMS): Remove scdaemon.
+
+2013-03-29 Werner Koch <wk at gnupg.org>
+
+ copyright assignments are not anymore required.
+
+2013-03-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC status fix.
+ * scd/apdu.c (pcsc_get_status_direct): Check PCSC_STATE_MUTE only when
+ PCSC_STATE_PRESENT.
+
+ * scd/pcsc-wrapper.c (handle_status): Ditto.
+
+ scd: PC/SC cleanup (more).
+ * scd/apdu.c (control_pcsc_direct, control_pcsc_wrapped, control_pcsc)
+ (check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify): Use
+ pcsc_dword_t.
+
+ scd: call update_card_removed only when detecting removal.
+ * scd/command.c (update_reader_status_file): Add condition
+ vr->status == 0.
+
+2013-03-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC cleanup.
+ * scd/apdu.c (pcsc_dword_t): New. It was named as DWORD (double-word)
+ when a word was 16-bit.
+ (struct reader_table_s): Fixes for types.
+ (struct pcsc_readerstate_s) [__APPLE__]: Enable #pragma pack(1).
+ Throughout: Fixes for types.
+
+ * scd/pcsc-wrapper.c: Likewise.
+
+2013-03-21 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Enable ja.po.
+ * po/LINGUAS: Enable ja.po.
+
+ scd: change default value of pinpad maxlen.
+ * scd/apdu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Default value
+ of maxlen for pinpad input is now 15 (was: 25).
+
+ * scd/ccid-driver.c (ccid_transceive_secure): Likewise.
+
+2013-03-20 Werner Koch <wk at gnupg.org>
+
+ Add code to allow for late memory cleanup.
+ * common/init.c (mem_cleanup_item_t): New.
+ (run_mem_cleanup): New.
+ (_init_common_subsystems): Add an atexit for it.
+ (register_mem_cleanup_func): New.
+
+ * g10/kbnode.c (cleanup_registered): New.
+ (release_unused_nodes): New.
+ (alloc_node): Call register_mem_cleanup_func.
+
+ kbx: Remove unused macro.
+ * kbx/keybox.h (KEYBOX_WITH_OPENPGP): Remove unused macro.
+
+2013-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Print indicator for unknown key capability.
+ * g10/keylist.c (print_capabilities): Print '?' for unknown usage.
+
+2013-03-19 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Allow setting of all zero key flags.
+ * g10/keygen.c (do_add_key_flags): Do not check for empty key flags.
+
+2013-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Distinguish between missing and cleared key flags.
+ * include/cipher.h (PUBKEY_USAGE_NONE): New.
+ * g10/getkey.c (parse_key_usage): Set new flag.
+
+2013-03-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: ccid-driver supporting larger APDU.
+ * scd/ccid-driver.c (ccid_transceive_apdu_level): Support larger
+ APDU.
+
+ scd: fix missing close paren.
+ * scd/app-openpgp.c (du_auth): Fix.
+
+2013-03-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: support ECDSA signing.
+ * scd/app-openpgp.c (do_sign): Only prepend message digest block
+ for RSA or do_auth.
+ (do_auth): Remove message digest block for ECDSA.
+
+2013-03-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: support ECDSA public key.
+ * scd/app-openpgp.c (key_type_t): New.
+ (CURVE_NIST_P256, CURVE_NIST_P384, CURVE_NIST_P521): New.
+ (struct app_local_s): Change keyattr to have key_type and union.
+ (get_ecc_key_parameters, get_curve_name): New.
+ (send_key_attr, get_public_key): Support ECDSA.
+ (build_privkey_template, do_writekey, do_genkey): Follow the change
+ of the member KEY_ATTR.
+ (parse_historical): New.
+ (parse_algorithm_attribute): Support ECDSA.
+
+2013-03-05 Werner Koch <wk at gnupg.org>
+
+ Require libgpg-error 1.11.
+ * configure.ac: Require libgpg-error 1.11.
+ * common/util.h (GPG_ERR_NO_KEYSERVER, GPG_ERR_INV_CURVE)
+ (GPG_ERR_UNKNOWN_CURVE): Remove fallback definitions.
+
+2013-02-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: pksign result conversion to sexp to upper layer.
+ * agent/agent.h (divert_pksign): Add R_SIGLEN argument.
+ * agent/divert-scd.c (divert_pksign): Return length at R_SIGLEN.
+ * agent/call-scd.c (agent_card_pksign): Move composition of
+ S-expression to...
+ * agent/pksign.c (agent_pksign_do): ... here.
+
+2013-02-22 Werner Koch <wk at gnupg.org>
+
+ Use has_leading_keyword in the assuan callbacks.
+ * agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
+ * agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
+ * g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
+ (inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
+ * g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
+ * sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
+ (inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
+ (keyinfo_status_cb, inq_import_key_parms): Ditto.
+ * sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
+ (lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
+
+ Remove some unused variables.
+ * tools/gpgconf-comp.c (gc_process_gpgconf_conf): Remove unused
+ used_components.
+ * agent/command-ssh.c (ssh_signature_encoder_ecdsa): Mark unused arg.
+ * g13/g13.c (main): Comment variable of yet unimplemented options.
+
+ gpg: Fix a memory leak in batch key generation.
+ * g10/keygen.c (append_to_parameter): New.
+ (proc_parameter_file): Use new func to extend the parameter list.
+
+ * g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
+ gcry_kdf_derive failed.
+ * g10/keygen.c (proc_parameter_file): Print a diagnostic if
+ passphrase_to_dek failed.
+
+ gpg: Handle the agent's NEW_PASSPHRASE inquiry.
+ * g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
+
+ common: Add func has_leading_keyword.
+ * common/stringhelp.c (has_leading_keyword): New.
+
+ Remove build hacks for FreeBSD.
+ * configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
+ LDFLAGS.
+
+2013-02-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: fix two bugs.
+ * agent/command.c (cmd_keytocard): Decrement KEYDATALEN.
+ * agent/findkey.c (agent_public_key_from_file): Increment for ELEMS.
+
+ gpg: fix keytocard and support ECC card for key attribute.
+ * g10/call-agent.c (agent_keytocard): Supply PARM arg.
+ * g10/card-util.c (card_status): Support ECC.
+ (card_store_subkey): Don't assume RSA.
+
+2013-02-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix a memory leak in batch key generation.
+ * g10/keygen.c (append_to_parameter): New.
+ (proc_parameter_file): Use new func to extend the parameter list.
+
+ * g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
+ gcry_kdf_derive failed.
+ * g10/keygen.c (proc_parameter_file): Print a diagnostic if
+ passphrase_to_dek failed.
+
+ gpg: Handle the agent's NEW_PASSPHRASE inquiry.
+ * g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
+
+ common: Add func has_leading_keyword.
+ * common/stringhelp.c (has_leading_keyword): New.
+
+2013-02-20 Werner Koch <wk at gnupg.org>
+
+ Remove build hacks for FreeBSD.
+ * configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
+ LDFLAGS.
+
+2013-02-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ gpg: Implement card_store_subkey again.
+ * g10/call-agent.h (agent_keytocard): New.
+ * g10/call-agent.c (agent_keytocard): New.
+ * g10/card-util.c (replace_existing_key_p): Returns 1 when replace.
+ (card_generate_subkey): Check return value of replace_existing_key_p.
+ (card_store_subkey): Implement again using agent_keytocard.
+
+ agent: Add KEYTOCARD command.
+ * agent/agent.h (divert_writekey, agent_card_writekey): New.
+ * agent/call-scd.c (inq_writekey_parms, agent_card_writekey): New.
+ * agent/command.c (cmd_keytocard, hlp_keytocard): New.
+ (register_commands): Add cmd_keytocard.
+ * agent/divert-scd.c (divert_writekey): New.
+
+ Japanese: update po and doc.
+ * doc/help.ja.txt, po/ja.po: Updated.
+
+2013-02-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Rename 'keypad' to 'pinpad'.
+ * NEWS: Mention scd changes.
+
+ * agent/divert-scd.c (getpin_cb): Change message.
+
+ * agent/call-scd.c (inq_needpin): Change the protocol to
+ POPUPPINPADPROMPT and DISMISSPINPADPROMPT.
+ * scd/command.c (pin_cb): Likewise.
+
+ * scd/apdu.c (struct reader_table_s): Rename member functions.
+ (check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify,
+ check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad
+ apdu_pinpad_verify, apdu_pinpad_modify): Rename.
+
+ * scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad)
+ (apdu_pinpad_verify, apdu_pinpad_modify): Rename.
+
+ * scd/iso7816.h (iso7816_check_pinpad): Rename.
+
+ * scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD.
+ (iso7816_check_pinpad): Rename.
+ (iso7816_verify_kp, iso7816_change_reference_data_kp): Follow
+ the change.
+
+ * scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename.
+ * scd/ccid-driver.c (ccid_transceive_secure): Use it.
+
+ * scd/app-dinsig.c (verify_pin): Follow the change.
+ * scd/app-nks.c (verify_pin): Follow the change.
+
+ * scd/app-openpgp.c (check_pinpad_request): Rename.
+ (parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow
+ the change.
+
+ * scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename.
+
+ * scd/scdaemon.h (opt): Rename to disable_pinpad,
+ enable_pinpad_varlen.
+
+ * tools/gpgconf-comp.c (gc_options_scdaemon): Rename to
+ disable-pinpad.
+
+2013-02-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Add pinentry-mode feature.
+ * g10/gpg.c: Include shareddefs.h.
+ (main): Add option --pinentry-mode.
+ * g10/options.h (struct opt): Add field pinentry_mode.
+ * g10/passphrase.c: Include shareddefs.h.
+ (have_static_passphrase): Take care of loopback pinentry_mode.
+ (read_passphrase_from_fd): Ditto.
+ (get_static_passphrase): New.
+ (passphrase_to_dek_ext): Factor some code out to ...
+ (emit_status_need_passphrase): new.
+ * g10/call-agent.c (start_agent): Send the pinentry mode.
+ (default_inq_cb): Take care of the PASSPHRASE inquiry. Return a
+ proper error code.
+ (agent_pksign): Add args keyid, mainkeyid and pubkey_algo.
+ (agent_pkdecrypt): Ditto.
+ * g10/pubkey-enc.c (get_it): Pass new args.
+ * g10/sign.c (do_sign): Pass new args.
+
+ * g10/call-agent.c (struct default_inq_parm_s): New. Change all
+ similar structs to reference this one. Change all users and inquire
+ callback to use this struct, instead of NULL or some undefined but not
+ used structs. This change will help to eventually get rid of global
+ variables.
+
+2013-02-06 Werner Koch <wk at gnupg.org>
+
+ agent: Move a typedef to common and provide parse_pinentry_mode.
+ * common/agent-opt.c: New.
+ * common/shareddefs.h: New.
+ * common/Makefile.am: Add new files.
+ * agent/agent.h: Include shareddefs.h.
+ (pinentry_mode_t): Factor out to shareddefs.h.
+ * agent/command.c (option_handler): Use parse_pinentry_mode.
+
+ agent: Return a better error code if no passphrase was given.
+ * agent/protect.c (hash_passphrase): Handle an empty passphrase.
+
+2013-02-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix check_keypad_request.
+ * scd/app-openpgp.c (check_keypad_request): 0 means not to use pinpad.
+
+ SCD: Add vendor specific initalization.
+ * scd/ccid-driver.c (ccid_vendor_specific_init): New.
+ (ccid_open_reader): Call ccid_vendor_specific_init.
+
+ SCD: Support P=N format for login data.
+ * scd/app-openpgp.c (parse_login_data): Support P=N format.
+
+ SCD: Better interoperability.
+ * scd/apdu.c: Fill bTeoPrologue[2] field.
+
+ SCD: Defaults to use pinpad if the reader has the capability.
+ * scd/app-openpgp.c (struct app_local_s): Remove VARLEN.
+ (parse_login_data): "P=0" means to disable pinpad.
+ (check_keypad_request): Default is to use pinpad if available.
+
+ SCD: handle keypad request on the card.
+ * scd/app-openpgp.c: Add 2013.
+ (struct app_local_s): Add keypad structure.
+ (parse_login_data): Add parsing keypad request on the card.
+ (check_keypad_request): New.
+ (verify_a_chv, verify_chv3, do_change_pin): Call check_keypad_request
+ to determine use of keypad.
+
+ SCD: Minor fix of ccid-driver.
+ * scd/ccid-driver.c (VENDOR_VEGA): Fix typo.
+
+ SCD: Add support of Covadis VEGA_ALPHA reader.
+ * scd/ccid-driver.c: Add 2013.
+ (VENDER_VEGA, VEGA_ALPHA):New.
+ (ccid_transceive_secure): VEGA_ALPHA is same firmware as GEMPC_PINPAD.
+ Change bNumberMessage to 0x01, as it works better (was: 0xff).
+
+ SCD: Support fixed length PIN input for keypad (PC/SC).
+ * scd/apdu.c (pcsc_keypad_verify): SUpport fixed length PIN input for
+ keypad.
+ (pcsc_keypad_modify): Likewise.
+ * scd/ccid-driver.c (ccid_transceive_secure): Clean up.
+
+ SCD: Support fixed length PIN input for keypad.
+ * scd/iso7816.h (struct pininfo_s): Remove MODE and add FIXEDLEN.
+ * scd/app-dinsig.c (verify_pin): Initialize FIXEDLEN to unknown.
+ * scd/app-nks.c (verify_pin): Likewise.
+ * scd/app-openpgp.c (verify_a_chv, verify_chv3, do_change_pin):
+ Likewise.
+ * scd/apdu.c (check_pcsc_keypad): Add comment.
+ (pcsc_keypad_verify, pcsc_keypad_modify): PC/SC driver only support
+ readers with the feature of variable length input (yet).
+ (apdu_check_keypad): Set FIXEDLEN.
+ * scd/ccid-driver.c (ccid_transceive_secure): Add GEMPC_PINPAD
+ specific settings.
+ Support fixed length PIN input for keypad.
+
+ SCD: API cleanup for keypad handling.
+ * scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
+ Change meaning of MODE.
+ (pininfo_t): Rename from iso7816_pininfo_t.
+ * scd/sc-copykeys.c: Include "iso7816.h".
+ * scd/scdaemon.c, scd/command.c: Likewise.
+ * scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
+ (ccid_transceive_secure): Follow the change of PININFO_T.
+ * scd/app.c: Include "apdu.h" after "iso7816.h".
+ * scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
+ (iso7816_change_reference_data_kp): Follow the change of API.
+ * scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
+ KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
+ (check_pcsc_keypad, check_ccid_keypad): Likewise.
+ (apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
+ (pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
+ (pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
+ (send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
+ (send_le): Follow the change of API.
+ * scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
+ (apdu_keypad_modify): Change the API.
+ * scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
+ change.
+
+ SCD: Clean up. Remove PADLEN for keypad input.
+ * scd/apdu.c (struct pininfo_s): Use iso7816_pininfo_s.
+ (struct reader_table_s): Remove last arg from check_keypad method.
+ (check_pcsc_keypad, check_pcsc_keypad): Remove PIN_PADLEN.
+ (pcsc_keypad_verify, pcsc_keypad_modify): Don't check PIN_PADLEN.
+ (send_apdu_ccid, ccid_keypad_operation): Remove PIN_PADLEN.
+ (apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify):
+ Likewise.
+
+ * scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
+ (apdu_keypad_modify): Remove PIN_PADLEN.
+
+ * scd/ccid-driver.c (ccid_transceive_secure): Remove PIN_PADLEN.
+
+ * scd/ccid-driver.h (ccid_transceive_secure): Remove PIN_PADLEN.
+
+ * scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
+ (iso7816_change_reference_data_kp): Remove PADLEN.
+
+ * scd/iso7816.h (struct iso7816_pininfo_s): Remove PADLEN, PADCHAR.
+
+ SCD: Add option enable-keypad-varlen and support for GEMPC_PINPAD.
+ * scd/scdaemon.h (opt): Add enable_keypad_varlen.
+ * scd/scdaemon.c (cmd_and_opt_values): Add oEnableKeypadVarlen.
+ (opts, main): Add oEnableKeypadVarlen.
+ * scd/ccid-driver.c (GEMPC_PINPAD): New.
+ (ccid_transceive_secure): Add enable_varlen handling.
+ Enable GEMPC_PINPAD.
+
+2013-01-30 Werner Koch <wk at gnupg.org>
+
+ Remove unused status codes.
+ * common/status.h (STATUS_BEGIN_STREAM, STATUS_END_STREAM)
+ (STATUS_SIEXPIRED): Remove unused codes.
+
+ gpg: Add status line PINENTRY_LAUNCHED.
+ * common/status.h (STATUS_PINENTRY_LAUNCHED): New.
+ * g10/server.c (server_local_s): Add field allow_pinentry_notify.
+ (option_handler): Add option "allow-pinentry-notify".
+ (gpg_proxy_pinentry_notify): New.
+ * g10/call-agent.c (default_inq_cb): Factor code out to the new
+ function.
+
+2013-01-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix a bug of handling return code from npth_join.
+ * agent/call-pinentry.c (agent_popup_message_stop): Fix npth_join
+ return code.
+
+2013-01-11 Christian Aistleitner <christian at quelltextlich.at>
+
+ gpg: Fix honoring --cert-digest-algo when recreating a cert.
+ * g10/sign.c (update_keysig_packet): Override original signature's
+ digest algo in hashed data and for hash computation.
+
+2013-01-11 Werner Koch <wk at gnupg.org>
+
+ Fix spurious cruft from configure summary output.
+ * configure.ac (build_scdaemon_extra): Remove $tmp cruft.
+
+2013-01-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Hold lock for pinpad input.
+ * scd/apdu.c (apdu_check_keypad, apdu_keypad_verify)
+ (apdu_keypad_modify): Hold lock to serialize communication.
+
+2013-01-08 Werner Koch <wk at gnupg.org>
+
+ kbx: Switch from MD5 to SHA-1 for the checksum.
+ * kbx/keybox-blob.c (put_membuf): Use a NULL buf to store zero bytes.
+ (create_blob_finish): Write just the needed space.
+ (create_blob_finish): Switch to SHA-1.
+ * kbx/keybox-dump.c (print_checksum): New.
+ (_keybox_dump_blob): Print the checksum and the verification status.
+
+ gpg: Cache keybox searches.
+ * common/iobuf.c (iobuf_seek): Fix for temp streams.
+ * g10/pubkey-enc.c (get_session_key, get_it): Add some log_clock calls.
+ * g10/keydb.c (dump_search_desc): New.
+ (enum_keyblock_states, struct keyblock_cache): New.
+ (keyblock_cache_clear): New.
+ (keydb_get_keyblock, keydb_search): Implement a keyblock cache.
+ (keydb_update_keyblock, keydb_insert_keyblock, keydb_delete_keyblock)
+ (keydb_rebuild_caches, keydb_search_reset): Clear the cache.
+
+ Make log_clock easier to read.
+ * common/logging.c (log_clock): Print in microseconds.
+
+ gpg: Remove a function wrapper.
+ * g10/keydb.h (keydb_search): Remove macro.
+ * g10/keydb.c (keydb_search2): Rename to keydb_search. Change all
+ callers.
+
+2013-01-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Support not-so-smart card readers.
+ * scd/ccid-driver.c (struct ccid_driver_s): Add auto_voltage,
+ auto_param, and auto_pps.
+ (parse_ccid_descriptor): Set auto_voltage, auto_param, and auto_pps.
+ Support non-autoconf readers.
+ (update_param_by_atr): New.
+ (ccid_get_atr): Use 5V for PowerOn when auto_voltage is not supported.
+ Use 0x10 when nonnull_nad for SetParameters.
+ Call update_param_by_atr for parsing ATR, and use param for
+ SetParameters.
+ Send PPS if reader requires it and card is negotiable.
+ When bNadValue in the return values of SetParameters == 0,
+ clear handle->nonnull_nad flag.
+
+2013-01-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Set the node flags while retrieving a keyblock.
+ * g10/keydb.c (parse_keyblock_image): Add args PK_NO and UID_NO and
+ set the note flags accordingly.
+ (keydb_get_keyblock): Transfer PK_NO and UID_NO to parse_keyblock_image.
+ * kbx/keybox-search.c (blob_cmp_fpr, blob_cmp_fpr_part)
+ (blob_cmp_name, blob_cmp_mail): Return the key/user number.
+ (keybox_search): Set the key and user number into the found struct.
+ (keybox_get_keyblock): Add args R_PK_NO and R_UID_NO and set them from
+ the found struct.
+
+ New function log_clock.
+ * common/logging.c (log_clock): New.
+ * g10/gpg.c (set_debug): Print clock debug flag.
+ * g10/options.h (DBG_CLOCK_VALUE, DBG_CLOCK): New.
+
+ gpg: Allow searching for user ids in a keybox.
+ * kbx/keybox-search.c (blob_cmp_name): Add arg X509 and adjust for PGP
+ use. Change callers.
+ (blob_cmp_mail): Add arg X509 and find the mailbox offset for PGP.
+ Chnage callers.
+ (has_subject_or_alt): Rename to has_username.
+ (has_username): Allow blobtype PGP.
+ (has_mail): Ditto.
+
+ gpg: Allow generation of more than 4096 keys in one run.
+ * g10/getkey.c (cache_public_key): Make room in the cache if needed.
+
+2013-01-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ Update Japanese Translation.
+ * po/ja.po: Fix wrong translations for designated revocation.
+ Reported by Hideki Saito.
+
+ Conflicts:
+ po/ja.po
+
+2013-01-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ Update Japanese Translation.
+ * po/ja.po: Fix fuzzy translations.
+
+2013-01-03 NIIBE Yutaka <gniibe at fsij.org>
+
+ Update Japanese Translation.
+ * po/ja.po: Update with POT.
+
+ Update Japanese Translation.
+ * po/ja.po: Start from the new one of 2.0.
+
+2012-12-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Add signature cache support to the keybox.
+ * g10/keydb.c (parse_keyblock_image): Add arg SIGSTATUS.
+ (keydb_get_keyblock): Handle it.
+ (build_keyblock_image): Add arg SIGSTATUS.
+ (keydb_insert_keyblock): Handle it.
+ * kbx/keybox-blob.c (pgp_create_sig_part): Add arg SIGSTATUS.
+ (_keybox_create_openpgp_blob): Ditto.
+ * kbx/kbxutil.c (import_openpgp): Adjust for above change.
+ * kbx/keybox.h (KEYBOX_FLAG_SIG_INFO): New.
+ * kbx/keybox-search.c (_keybox_get_flag_location): Handle new flag.
+ (keybox_get_keyblock): Add arg R_SIGSTATUS.
+ * kbx/keybox-update.c (keybox_insert_keyblock): Add arg SIGSTATUS.
+
+ kbxutil: Improve format of the Sig-Expire lines.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Print the expirate timestamp.
+
+ gpg: First working support for keyboxes.
+ * g10/getkey.c (get_pubkey_fast): Improve the assertion.
+ * kbx/keybox.h: Include iobuf.h.
+ * kbx/keybox-blob.c (keyboxblob_uid): Add field OFF.
+ (KEYBOX_WITH_OPENPGP): Remove use of this macro.
+ (pgp_create_key_part_single): New.
+ (pgp_temp_store_kid): Change to use the keybox-openpgp parser.
+ (pgp_create_key_part): Ditto.
+ (pgp_create_uid_part): Ditto.
+ (pgp_create_sig_part): Ditto.
+ (pgp_create_blob_keyblock): Ditto.
+ (_keybox_create_openpgp_blob): Ditto.
+ * kbx/keybox-search.c (keybox_get_keyblock): New.
+ * kbx/keybox-update.c (keybox_insert_keyblock): New.
+ * g10/keydb.c (parse_keyblock_image):
+ (keydb_get_keyblock): Support keybox.
+ (build_keyblock_image): New.
+ (keydb_insert_keyblock): Support keybox.
+
+ * kbx/kbxutil.c (import_openpgp, main): Add option --dry-run and print
+ a kbx file to stdout.
+
+ * kbx/keybox-file.c (_keybox_read_blob2): Allow keyblocks up to 10^6
+ bytes.
+
+ kbxutil: Print algo number and fold similar lines.
+ * kbx/keybox-defs.h (_keybox_openpgp_key_info): Add field ALGO.
+ * kbx/keybox-openpgp.c (parse_key): Store algo.
+ * kbx/kbxutil.c (dump_openpgp_key): Print algo number.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Print identical Sig-Expire
+ value lines with a range of indices.
+
+2012-12-27 Werner Koch <wk at gnupg.org>
+
+ gpg: First patches to support a keybox storage backend.
+ * kbx/keybox-defs.h (_keybox_write_header_blob): Move prototype to ..
+ * kbx/keybox.h: here.
+ * kbx/keybox-init.c (keybox_lock): Add dummy function
+ * g10/keydb.c: Include keybox.h.
+ (KeydbResourceType): Add KEYDB_RESOURCE_TYPE_KEYBOX.
+ (struct resource_item): Add field kb.
+ (maybe_create_keyring_or_box): Add error descriptions to diagnostics.
+ Add arg IS_BOX. Write a header for a new keybox file.
+ (keydb_add_resource): No more need for the force flag. Rename the
+ local variable "force" to "create". Add URL scheme "gnupg-kbx". Add
+ magic test to detect a keybox file. Add basic support for keybox.
+ (keydb_new, keydb_get_resource_name, keydb_delete_keyblock)
+ (keydb_locate_writable, keydb_search_reset, keydb_search2): Add
+ support for keybox.
+ (lock_all, unlock_all): Ditto.
+ * g10/Makefile.am (needed_libs): Add libkeybox.a.
+ (gpg2_LDADD, gpgv2_LDADD): Add KSBA_LIBS as a workaround.
+
+ * g10/keydb.h (KEYDB_RESOURCE_FLAG_PRIMARY)
+ KEYDB_RESOURCE_FLAG_DEFAULT, KEYDB_RESOURCE_FLAG_READONLY): New.
+ * g10/gpg.c, g10/gpgv.c (main): Use new constants.
+
+2012-12-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Import only packets which are allowed in a keyblock.
+ * g10/import.c (valid_keyblock_packet): New.
+ (read_block): Store only valid packets.
+
+2012-12-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Make commit 2b3cb2ee actually work.
+ * g10/sign.c (update_keysig_packet): Use digest_algo.
+
+ (cherry-picked from commit d23ec86095714d388acac14b515445fe69f019e9)
+
+ gpg: Suppress "public key already present" in quiet mode.
+ * g10/pkclist.c (find_and_check_key, build_pk_list): Print a
+ diagnostic only in non-quiet mode.
+
+2012-12-18 Werner Koch <wk at gnupg.org>
+
+ common: Add meta option ignore-invalid-option.
+ * common/argparse.c (iio_item_def_s, IIO_ITEM_DEF): New.
+ (initialize): Init field IIO_LIST.
+ (ignore_invalid_option_p): New.
+ (ignore_invalid_option_add): New.
+ (ignore_invalid_option_clear): New.
+ (optfile_parse): Implement meta option.
+
+2012-12-13 Werner Koch <wk at gnupg.org>
+ Hans of Guardian <hans at guardianproject.info>
+
+ utf8conv.c: Add hacks for Android.
+ * common/utf8conv.c [HAVE_ANDROID_SYSTEM]: Do not include iconv.h.
+ (iconv_open, iconv_close, load_libiconv) [HAVE_ANDROID_SYSTEM]: New
+ dummy functions.
+ (set_native_charset) [HAVE_ANDROID_SYSTEM]: Force use of "utf-8".
+ (jnlib_iconv_open) [HAVE_ANDROID_SYSTEM]: Act the same as under W32.
+ (jnlib_iconv) [HAVE_ANDROID_SYSTEM]: Ditto.
+ (jnlib_iconv_close) [HAVE_ANDROID_SYSTEM]: Ditto.
+
+2012-12-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Fix the process of writing key or generating key.
+ * scd/app-openpgp.c (store_fpr): Flush KEY-FPR and KEY-TIME.
+
+2012-12-12 Werner Koch <wk at gnupg.org>
+
+ ssh: Support ECDSA keys.
+ * agent/command-ssh.c (SPEC_FLAG_IS_ECDSA): New.
+ (struct ssh_key_type_spec): Add fields CURVE_NAME and HASH_ALGO.
+ (ssh_key_types): Add types ecdsa-sha2-nistp{256,384,521}.
+ (ssh_signature_encoder_t): Add arg spec and adjust all callers.
+ (ssh_signature_encoder_ecdsa): New.
+ (sexp_key_construct, sexp_key_extract, ssh_receive_key)
+ (ssh_convert_key_to_blob): Support ecdsa.
+ (ssh_identifier_from_curve_name): New.
+ (ssh_send_key_public): Retrieve and pass the curve_name.
+ (key_secret_to_public): Ditto.
+ (data_sign): Add arg SPEC and change callers to pass it.
+ (ssh_handler_sign_request): Get the hash algo from SPEC.
+ * common/ssh-utils.c (get_fingerprint): Support ecdsa.
+
+ * agent/protect.c (protect_info): Add flag ECC_HACK.
+ (agent_protect): Allow the use of the "curve" parameter.
+ * agent/t-protect.c (test_agent_protect): Add a test case for ecdsa.
+
+ * agent/command-ssh.c (ssh_key_grip): Print a better error code.
+
+2012-12-11 Werner Koch <wk at gnupg.org>
+
+ ssh: Rewrite a function for better maintainability.
+ * agent/command-ssh.c (ssh_signature_encoder_dsa): Rewrite.
+
+2012-12-10 Werner Koch <wk at gnupg.org>
+
+ ssh: Improve key lookup for many keys.
+ * agent/command-ssh.c: Remove dirent.h.
+ (control_file_s): Add struct item.
+ (rewind_control_file): New.
+ (search_control_file): Factor code out to ...
+ (read_control_file_item): New.
+ (ssh_handler_request_identities): Change to iterate over entries in
+ sshcontrol.
+
+ ssh: Cleanup sshcontrol file access code.
+ * agent/command-ssh.c (SSH_CONTROL_FILE_NAME): New macro to replace
+ the direct use of the string.
+ (struct control_file_s, control_file_t): New.
+ (open_control_file, close_control_file): New. Use them instead of
+ using fopen/fclose directly.
+
+ agent: Add envvar "gnupg_SSH_AUTH_SOCK_by"
+ * agent/gpg-agent.c (main): Pass new envar gnupg_SSH_AUTH_SOCK_by to
+ an invoked process.
+
+ config: Update npth.m4.
+ * m4/npth.m4: Take from current npth master.
+
+2012-12-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ Revert SCD changes of 2010-05-03.
+ * scd/apdu.c (pcsc_no_service): Remove.
+ (open_pcsc_reader_direct, open_pcsc_reader_wrapped): Remove
+ pcsc_no_service support.
+ (apdu_open_reader): Remove R_NO_SERVICE.
+ * scd/apdu.h (apdu_open_reader): Remove R_NO_SERVICE.
+ * scd/command.c (reader_disabled): Remove.
+ (get_current_reader): Follow the change of R_NO_SERVICE.
+ (open_card, cmd_serialno, scd_command_handler): Remove reader_disabled
+ support.
+ * scd/sc-copykeys.c (main): Follow the change of R_NO_SERVICE.
+
+ Don't keep opening unavailable card reader.
+ * scd/command.c (update_reader_status_file): Don't call
+ get_current_reader.
+
+2012-11-30 David Shaw <dshaw at jabberwocky.com>
+
+ Refresh sample keys.
+
+ Adjust awk to not add trailing whitespace.
+ * mksamplekeys: Tweak awk script to not add trailing whitespace to
+ blank lines (makes git pre-commit hook unhappy)
+
+2012-11-29 David Shaw <dshaw at jabberwocky.com>
+
+ The keyserver search menu should honor --keyid-format.
+ * keyserver.c (print_keyrec): Honor --keyid-format when getting back
+ full fingerprints from the keyserver (the comment in the code was
+ correct, the code was not).
+
+2012-11-27 Werner Koch <wk at gnupg.org>
+
+ Fix printing of ECC algo names in hkp keyserver listings.
+ * g10/keyserver.c (print_keyrec): Map OpenPGP algorithm ids.
+
+2012-11-26 Ben Kibbey <bjk at luxsci.net>
+
+ Check for inet_addr() in -lnsl.
+ * configure.ac: Check for inet_addr() in libnsl.
+
+2012-11-20 Werner Koch <wk at gnupg.org>
+
+ Do not use a broken ttyname.
+ * configure.ac (HAVE_BROKEN_TTYNAME): New ac_define set for Android
+ systems.
+ * common/util.h (gnupg_ttyname): New macro. Change all callers of
+ ttyname to use this macro instead.
+ (ttyname) [W32]: Rename to _gnupg_ttyname and use also if
+ HAVE_BROKEN_TTYNAME is defined.
+ * common/simple-pwquery.c (agent_send_all_options): Keep on using
+ ttyname unless HAVE_BROKEN_TTYNAME is set. This is because this file
+ may be used standalone.
+
+2012-11-16 Werner Koch <wk at gnupg.org>
+
+ Fix non-portable use of chmod in autogen.sh.
+ * autogen.sh: Remove option -c from chmod.
+
+ Improve parsing of the GIT revision number.
+ * configure.ac (mmm4_revision): Use git rev-parse.
+
+ Add an OpenPGP card vendor.
+ * g10/card-util.c (get_manufacturer): Add Yubico.
+
+2012-11-06 Werner Koch <wk at gnupg.org>
+
+ agent: Use wipememory instead of memset in one place.
+ * agent/command.c (clear_outbuf): Use wipememory. Suggested by Ben
+ Kibbey.
+
+ Allow decryption with card keys > 3072 bits.
+ * scd/command.c (MAXLEN_SETDATA): New.
+ (cmd_setdata): Add option --append.
+ * agent/call-scd.c (agent_card_pkdecrypt): Use new option for long
+ data.
+
+ * scd/app-openpgp.c (struct app_local_s): Add field manufacturer.
+ (app_select_openpgp): Store manufacturer.
+ (do_decipher): Print a note for broken cards.
+
+2012-11-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix wrong use of gcry_sexp_build_array.
+ * findkey.c (agent_public_key_from_file): Fix use of
+ gcry_sexp_build_array.
+
+2012-10-31 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Upon error, open_pcsc_reader_wrapped does same as _direct.
+ * scd/apdu.c (PCSC_E_NO_SERVICE): New.
+ (open_pcsc_reader_direct): Use PCSC_E_NO_SERVICE.
+ (open_pcsc_reader_wrapped): Set pcsc_no_service.
+
+2012-08-24 Werner Koch <wk at gnupg.org>
+
+ Update and enable French translation.
+ * po/fr.po: Update.
+ * po/LINGUAS: Enable fr.
+
+2012-08-24 David Prévot <taffit at debian.org>
+
+ Fix typos spotted during translations.
+ * agent/genkey.c: s/to to/to/
+ * sm/*.c: s/failed to allocated/failed to allocate/
+ * sm/certlist.c, ./dirmngr/validate.c: s/should have not/should not have/
+ * g10/seskey.c: missing closing parenthesis
+ * dirmngr/crlcache.c: s/may has/may have/
+
+ Consistency fix:
+
+ * g10/gpg.c, kbx/kbxutil.c, sm/gpgsm.c: uppercase after Syntax
+ * dirmngr/dirmngr_ldap: no period in Syntax
+ * dirmngr/dirmngr-client.c: infinitive for option description:
+ s/certificates are expected/expect certificates/
+
+ Keep previous msgids of translated messages.
+ * po/Makefile.in.in: Use --previous with msgmerge.
+
+2012-08-24 Hans-Christoph Steiner <hans at eds.org>
+
+ Fix build system for Android by disabling tests since its x-compiled.
+ * configure.ac (HAVE_ANDROID_SYSTEM, RUN_TESTS): New.
+ (AH_BOTTOM) [__ANDROID__]: Do not re-define ttyname.
+ * Makefile.am: Depend tests on new RUN_TESTS conditional.
+
+2012-08-24 Werner Koch <wk at gnupg.org>
+
+ Fix left over use of jnlib on some platforms.
+ * tools/watchgnupg.c: Take mischelp.h from common/ and not jnlib/.
+
+2012-06-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: handle reader/token removal.
+ * scd/apdu.c (pcsc_error_to_sw): PCSC_E_UNKNOWN_READER means
+ SW_HOST_NO_READER.
+
+2012-06-05 Werner Koch <wk at gnupg.org>
+
+ Change all quotes in strings and comments to the new GNU standard.
+ The asymmetric quotes used by GNU in the past (`...') don't render
+ nicely on modern systems. We now use two \x27 characters ('...').
+
+ The proper solution would be to use the correct Unicode symmetric
+ quotes here. However this has the disadvantage that the system
+ requires Unicode support. We don't want that today. If Unicode is
+ available a generated po file can be used to output proper quotes. A
+ simple sed script like the one used for en at quote is sufficient to
+ change them.
+
+ The changes have been done by applying
+
+ sed -i "s/\`\([^'\`]*\)'/'\1'/g"
+
+ to most files and fixing obvious problems by hand. The msgid strings in
+ the po files were fixed with a similar command.
+
+2012-05-24 Werner Koch <wk at gnupg.org>
+
+ Print the hash algorithm in colon mode key listing.
+ * g10/keylist.c (list_keyblock_colon): Print digest_algo.
+
+ Fix type conflict warning.
+ * g10/keylist.c: Change min_cert_level to a byte.
+
+2012-05-11 Werner Koch <wk at gnupg.org>
+
+ Switch to the new automagic beta numbering scheme.
+ * configure.ac: Add all the require m4 magic.
+
+2012-05-08 Werner Koch <wk at gnupg.org>
+
+ Add tweaks for the not anymore patented IDEA algorithm.
+ * g10/keygen.c (keygen_set_std_prefs): Include IDEA only in PGP2
+ compatibility mode.
+ * g10/misc.c (idea_cipher_warn): Remove. Also remove all callers.
+ * common/status.h (STATUS_RSA_OR_IDEA): Remove. Do not emit this
+ status anymore.
+
+ po: Update de.po.
+ * po/de.po: Update.
+
+ common: Remove generated files only during maintainer-clean.
+ * common/Makefile.am (CLEANFILES): Rename to MAINTAINERCLEANFILES.
+
+2012-04-30 Werner Koch <wk at gnupg.org>
+
+ agent: Fix deadlock in trustlist due to the switch to npth.
+ * agent/trustlist.c (clear_trusttable): New.
+ (agent_reload_trustlist): Use new function.
+ (read_trustfiles): Require to be called with lock held.
+ (agent_istrusted): Factor all code out to ...
+ (istrusted_internal): new. Add ALREADY_LOCKED arg. Make sure the
+ table islocked. Do not print TRUSTLISTFLAG stati if called internally.
+ (agent_marktrusted): Replace calls to agent_reload_trustlist by
+ explicit code.
+
+2012-04-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ make DNS and URI fields work in gpgsm --gen-key.
+ * sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Actually set mb_uri and
+ mb_dns.avoid buffer strncpy-induced buffer overrun
+
+2012-04-26 Jim Meyering <jim at meyering.net>
+
+ avoid buffer strncpy-induced buffer overrun.
+ * dirmngr/crlcache.c (open_dir): Ensure that both this_update
+ and next_update member strings are NUL-terminated.
+
+ remove doubled words in a comment.
+
+2012-04-20 Werner Koch <wk at gnupg.org>
+
+ Change license for some files in common to LGPLv3+/GPLv2+.
+ Having the LGPL on the common GnuPG code helps to share code
+ between GnuPG and related projects (like GPGME and Libassuan). This
+ is good for interoperability and to reduces bugs.
+
+ * common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
+ * common/b64enc.c, common/convert.c, common/dns-cert.c
+ * common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
+ * common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
+ * common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
+ * common/helpfile.c, common/homedir.c, common/http.c, common/http.h
+ * common/i18n.c, common/init.c, common/init.h, common/iobuf.c
+ * common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
+ * common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
+ * common/percent.c, common/pka.c, common/pka.h, common/session-env.c
+ * common/session-env.h, common/sexp-parse.h, common/sexputil.c
+ * common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
+ * common/ssh-utils.h, common/sysutils.c, common/sysutils.h
+ * common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
+ * common/userids.c, common/userids.h, common/xasprintf.c: Change
+ license to LGPLv3+/GPLv2+/
+
+2012-04-10 Ben Kibbey <bjk at luxsci.net>
+
+ Fix killing PID -1.
+ When the KILLSCD command had been sent a race condition would occur
+ causing PID -1 getting killed, which on Linux seems to terminate all
+ applications for the current user.
+
+2012-04-05 Werner Koch <wk at gnupg.org>
+
+ Do not mix test result with progress lines.
+ This makes parsing of the results easier. Fixes bug#1400.
+
+ * tests/openpgp/defs.inc (progress_cancel, progress_end)
+ (progress_new): New.
+ * tests/openpgp/conventional-mdc.test: Use progress functions
+ * tests/openpgp/conventional.test: Ditto.
+ * tests/openpgp/encrypt-dsa.test: Ditto.
+ * tests/openpgp/encrypt.test: Ditto.
+ * tests/openpgp/sigs.test: Ditto.
+
+2012-04-04 Ben Kibbey <bjk at luxsci.net>
+
+ Mention status messages in the documentation.
+ Note INQUIRE_MAXLEN.
+
+ Document PASSWD --preset.
+
+ Document GENKEY options.
+
+ Document PRESET_PASSPHRASE.
+
+ Document CLEAR_PASSPHRASE.
+ And describe the --mode=normal option.
+
+2012-03-27 Werner Koch <wk at gnupg.org>
+
+ Fix timegm regression test.
+ * common/t-timestuff.c (test_timegm): Change test to use January and
+ not February or December+1. Bug spotted by Daniel Kahn Gillmor.
+
+ Print warning for arguments not considered an option.
+ GnuPG requires that options are given before other arguments. This
+ can sometimes be confusing. We now print a warning if we found an
+ argument looking alike a long option without being preceded by the
+ stop option. This is bug#1343.
+
+ * common/argparse.h (ARGPARSE_FLAG_STOP_SEEN): New.
+ * common/argparse.c (arg_parse): Set new flag.
+ * g10/gpg.c (main): Print the warning.
+ * agent/gpg-agent.c (main): Ditto.
+ * dirmngr/dirmngr.c (main): Ditto.
+ * g13/g13.c (main): Ditto.
+ * scd/scdaemon.c (main): Ditto.
+ * sm/gpgsm.c (main): Ditto.
+ * tools/gpg-connect-agent.c (main): Ditto.
+ * tools/gpgconf.c (main): Ditto.
+
+2012-03-26 Werner Koch <wk at gnupg.org>
+
+ Allow compress algorithm 0.
+ * g10/mainproc.c (proc_compressed): Remove superfluous check for
+ compress algorithm 0. Reported by pfandrade. This is bug#1326.
+
+ Add mksamplekeys script.
+ * doc/mksamplekeys: New.
+
+2012-02-28 Marcus Brinkmann <mb at g10code.com>
+
+ Replace npth_yield in busy wait by npth_usleep.
+ * dirmngr/ldap-wrapper.c (ldap_wrapper_wait_connections): Call
+ npth_usleep instead of npth_yield.
+
+2012-02-16 Marcus Brinkmann <mb at g10code.com>
+
+ Check for lber and link dirmngr_ldap to it.
+ * configure.ac (LBER_LIBS, HAVE_LBER): New variables, check for lber.
+ * dirmngr/Makefile.am (dirmngr_lda_LDADD): Add $(LBER_LIBS).
+
+2012-02-07 Werner Koch <wk at gnupg.org>
+
+ agent: Add pin length field to the shadowed private key format.
+ This is not yet fully implemented. It will eventually allow to
+ support pinpad equipped readers which do not support variable length
+ pin lengths.
+ * agent/protect.c (parse_shadow_info): Add optional arg R_PINLEN and
+ parse pinlen info. Change all callers to pass NULL for it.
+
+ Use new status printing functions.
+ * agent/command.c (cmd_geteventcounter): Get rid of static buffers.
+ * scd/command.c (cmd_serialno, cmd_learn): Simplify by using
+ print_assuan_status.
+
+ agent: New function agent_print_status.
+ * common/asshelp2.c (vprint_assuan_status): New.
+ (print_assuan_status): Re-implement using above func.
+ * agent/command.c (agent_print_status): New.
+
+ po: Add Ukrainian translation.
+ * po/uk.po: New.
+
+ common: Replace macro based function calls by using DEFAULT_ERRSOURCE.
+ * common/dns-cert.h (get_dns_cert): Remove macro.
+ * common/dns-cert.c (_get_dns_cert): Rename to get_dns_cert. Replace
+ arg ERRSOURCE by global DEFAULT_ERRSOURCE.
+ * common/http.h (http_parse_uri, http_raw_connect, http_open)
+ (http_open_document, http_wait_response): Remove macros.
+ * common/http.c (_http_parse_uri, _http_raw_connect, _http_open)
+ (_http_open_document, _http_wait_response): Remove underscore from
+ symbols. Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
+ * common/ssh-utils.h (ssh_get_fingerprint)
+ (ssh_get_fingerprint_string): Remove macros.
+ * common/ssh-utils.h (_ssh_get_fingerprint)
+ (_ssh_get_fingerprint_string): Remove underscore from symbols.
+ Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
+ * common/tlv.h (parse_ber_header, parse_sexp): Remove macros.
+ * common/tlv.c: Include util.h.
+ (_parse_ber_header, _parse_sexp): Remove underscore from symbols.
+ Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
+
+2012-02-06 Werner Koch <wk at gnupg.org>
+
+ Add replacement hack for Android's broken ttyname.
+ * configure.ac (HAVE_TTYNAME) [__ANDROID__]: Add hack.
+
+ agent: Simplify printing of INQUIRE_MAXLEN.
+ * agent/command.c: Include asshelp.h.
+ (cmd_pkdecrypt, cmd_genkey, cmd_preset_passphrase)
+ (pinentry_loopback): Use print_assuan_status for INQUIRE_MAXLEN.
+
+ common: Add function print_assuan_status.
+ * common/asshelp2.c: New.
+ (print_assuan_status): New function.
+ * common/Makefile.am (common_sources): Add asshelp2.c.
+
+ common: Add a global variable to for the default error source.
+ For the shared code parts it is cumbersome to pass an error sourse
+ variable to each function. Its value is always a constant for a given
+ binary and thus a global variable makes things a lot easier than the
+ former macro stuff.
+ * common/init.c (default_errsource): New global var.
+ (init_common_subsystems): Rename to _init_common_subsystems. Set
+ DEFAULT_ERRSOURCE.
+ * common/init.h: Assert value of GPG_ERR_SOURCE_DEFAULT.
+ (init_common_subsystems): New macro.
+ * common/util.h (default_errsource): Add declaration.
+ * kbx/keybox-defs.h: Add some GPG_ERR_SOURCE_DEFAULT trickery.
+
+2012-02-03 Ben Kibbey <bjk at luxsci.net>
+
+ Also let GENKEY and PKDECRYPT send the INQUIRE_MAXLEN status message.
+ * agent/command.c (cmd_pkdecrypt): Send the INQUIRE_MAXLEN status
+ message before doing the inquire.
+ (cmd_genkey): Ditto.
+
+2012-02-02 Ben Kibbey <bjk at luxsci.net>
+
+ Inform the client of the preset passphrase length.
+ * agent/command.c (cmd_preset_passphrase): Send the INQUIRE_MAXLEN
+ status message before inquiring the passphrase.
+
+2012-02-01 David Shaw <dshaw at jabberwocky.com>
+
+ Honor --cert-digest-algo when recreating a cert.
+ * g10/sign.c (update_keysig_packet): Honor --cert-digest-algo when
+ recreating a cert.
+
+ This is used by various things in --edit-key like setpref, primary,
+ etc. Suggested by Christian Aistleitner.
+
+2012-01-27 Werner Koch <wk at gnupg.org>
+
+ gl: Add support for Android to stdint.h replacement.
+ * gl/stdint_.h: When included from Bionic <sys/types.h>, just include
+ the system's <stdint.h>.
+
+ gpg-connect-tool: Take the string "true" as a true condition.
+ * tools/gpg-connect-agent.c (main): Handle strings "true" and "yes" in
+ conditions as expected.
+
+2012-01-26 Ben Kibbey <bjk at luxsci.net>
+
+ Return GPG_ERR_CARD_NOT_PRESENT when pinentry-mode=loopback.
+ Since there isn't a way to prompt the user to insert the smartcard when
+ pinentry-mode=loopback, return GPG_ERR_CARD_NOT_PRESENT instead of
+ GPG_ERR_NO_PIN_ENTRY.
+
+ * agent/divert-scd.c (ask_for_card): Return GPG_ERR_CARD_NOT_PRESENT
+ when pinentry-mode=loopback.
+
+ Also check for GPG_ERR_ASS_CANCELED during an inquire.
+ Fix pinentry-mode=loopback when cancelling an inquire from scdaemon.
+ This is similar to commit 4f21f8d but for both protocol command
+ cancellation and pinentry cancellation.
+
+ * agent/call-scd.c (agent_card_pkdecrypt): Check for
+ GPG_ERR_ASS_CANCELED.
+ (agent_card_pksign): Ditto.
+
+2012-01-25 Werner Koch <wk at gnupg.org>
+
+ nPth is now a hard requirement for GnuPG.
+ * configure.ac: Remove cruft to allow building without npth.
+
+ Require libassuan 2.1.0.
+ * configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.1.0. This is due to
+ the npth changes.
+
+ Fix strerror vs. gpg_strerror usage.
+ This bug was introduced by the migration to npth.
+ * agent/gpg-agent.c (handle_connections): Use strerror.
+
+ Add missing variable.
+ * agent/gpg-agent.c (handle_connections) [!W32]: Add missing variable.
+
+2012-01-25 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ Port LDAP wrapper to NPTH.
+ * agent/gpg-agent.c (handle_connections): Handle error.
+ * dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c: Port to NPTH.
+
+ Port Windows code to NPTH.
+ * agent/gpg-agent.c (get_agent_ssh_socket_name): Use
+ INVALID_HANDLE_VALUE instead of 0.
+ (handle_signal) [!HAVE_W32_SYSTEM]: Don't define.
+ (handle_connections): Port Windows code to NPTH.
+ * dirmngr/dirmngr.c (handle_connections): Port Windows code to NPTH.
+ * g13/g13.c (handle_connections): Port Windows code to NPTH.
+ * scd/scdaemon.c (handle_connections): Port Windows code to NPTH.
+
+ Port to npth.
+ * configure.ac: Don't check for PTH but for NPTH.
+ (AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
+ (have_pth): Rename to ...
+ (have_npth): ... this.
+ (USE_GNU_NPTH): Rename to ...
+ (USE_GNU_PTH): ... this.
+ * m4/npth.m4: New file.
+ * agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
+ agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
+ agent/trustlist.c, common/Makefile.am, common/estream.c,
+ common/exechelp-posix.c, common/exechelp-w32.c,
+ common/exechelp-w32ce.c, common/http.c, common/init.c,
+ common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
+ dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
+ dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
+ g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
+ scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
+ scd/scdaemon.c, tools/Makefile.am: Port to npth.
+
+2012-01-25 Werner Koch <wk at gnupg.org>
+
+ Require gitlog-to-changelog to be installed.
+ * Makefile.am (GITLOG_TO_CHANGELOG): New.
+ (gen-ChangeLog): Use installed version of gitlog-to-changelog.
+
+2012-01-20 David Shaw <dshaw at jabberwocky.com>
+
+ Changes to --min-cert-level should cause a trustdb rebuild (issue 1366)
+ * g10/gpgv.c, g10/trustdb.c (read_trust_options): Add min_cert_level
+
+ * g10/trustdb.c (check_trustdb_stale): Request a rebuild if
+ pending_check_trustdb is true (set when we detect a trustdb
+ parameter has changed).
+
+ * g10/keylist.c (public_key_list): Use 'l' in the "tru" with-colons
+ listing for min_cert_level not matching.
+
+ * g10/tdbio.c (tdbio_update_version_record, create_version_record,
+ tdbio_db_matches_options, tdbio_dump_record, tdbio_read_record,
+ tdbio_write_record): Add a byte for min_cert_level in the tdbio
+ version record.
+
+2012-01-20 Werner Koch <wk at gnupg.org>
+
+ estream: Fix unclean usage of realloc.
+ * common/estream-printf.c (_ESTREAM_PRINTF_MALLOC): Remove.
+ (_ESTREAM_PRINTF_FREE): Remove.
+ (_ESTREAM_PRINTF_REALLOC): New.
+ (fixed_realloc) [!_ESTREAM_PRINTF_REALLOC]): New.
+ (estream_vasprintf): Use my_printf_realloc instead of my_printf_malloc
+ and my_printf_free.
+ (dynamic_buffer_out): Use my_printf_realloc instead of realloc.
+
+ Do not copy default merge commit log entries into the ChangeLog.
+ * scripts/gitlog-to-changelog: Skip merge commits.
+
+2012-01-18 Ben Kibbey <bjk at luxsci.net>
+
+ Add the INQUIRE_MAXLEN status message.
+ This status message is used to inform the client of the maximum length
+ of an inquired passphrase and is used in pinentry-mode=loopback.
+
+ * agent/command.c (pinentry_loopback): Send the INQUIRE_MAXLEN status
+ message before doing the inquire.
+
+2012-01-16 Jim Meyering <meyering at redhat.com>
+
+ yat2m: don't dereference pointer to freed memory.
+ * doc/yat2m.c (top_parse_file): Correct macrolist-freeing loop.
+
+ gpg-agent: fix lc-messages handling not to change Xauthority setting.
+ * agent/gpg-agent.c (main): Supply omitted "break" statement for
+ lc-messages option. Otherwise, control would fall through to the
+ following oXauthority case and use the same value there.
+
+2012-01-15 Werner Koch <wk at gnupg.org>
+
+ Fix indentation.
+
+2012-01-14 Ben Kibbey <bjk at luxsci.net>
+
+ Fix scdaemon pinentry inquire cancelation.
+ Similar to commit 29af488 but also fixes PKDECRYPT and PKSIGN.
+
+ * agent/call-scd.c (agent_card_pkdecrypt): Check for GPG_ERR_CANCELED
+ when returning from the PKDECRYPT operation of scdaemon and cancel the
+ inquire.
+ (agent_card_pksign): Ditto.
+ (cancel_inquire): New.
+
+2012-01-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix segv with RSA_S keys.
+ * g10/misc.c (pubkey_get_npkey, pubkey_get_nskey)
+ (pubkey_get_nsig, pubkey_get_nenc): Map all RSA algo ids to
+ GCRY_PK_RSA.
+
+ estream: Avoid printing leading zeroes by %p on 32 bit systems.
+ * common/estream-printf.c (pr_pointer): Synchronize definition of
+ AULONG with its use.
+
+2012-01-11 David Shaw <dshaw at jabberwocky.com>
+
+ Refresh sample keys.
+
+2012-01-10 David Shaw <dshaw at jabberwocky.com>
+
+ Adapt HKP fix for fingerprint/long keyid retrievals for dirmngr.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_get): Use the longest valid keyid form
+
+2012-01-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Make the double space in the middle of a fingerprint optional.
+ This change might help to c+p a fingerprint from an HTML page without
+ being enclosed in a "pre" tag.
+ * common/userids.c (classify_user_id): Skip a second blank in the
+ middle of a fingerprint.
+
+ gpg: Allow use of a standard space separated fingerprint.
+ * common/userids.c (classify_user_id): Check for space separated GPG
+ fingerprint.
+
+2012-01-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ Merge ccid_driver_improvement branch.
+ * scd/apdu.c (ccid_keypad_operation): Rename from ccid_keypad_verify.
+ (open_ccid_reader): Use ccid_keypad_operation for verify and modify.
+
+ * scd/ccid-driver.c (VENDOR_VASCO, VASCO_920): New.
+ (ccid_transceive_apdu_level): Permit sending packet where
+ apdulen <= 289. Support receiving packets in a chain.
+ (ccid_transceive_secure): Maximum is 15 for VASCO DIGIPASS 920.
+ Support keypad_modify method such as CHANGE_REFERENCE_DATA: 0x24.
+
+2012-01-03 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ Silence gcc warning.
+ * sm/call-dirmngr.c (get_cached_cert): Make sure buflen is initialized.
+
+ Revert last change, add comment about link() return values.
+ * common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Do not check
+ return value of link().
+
+ Fix compiler warnings.
+ * common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Check return
+ value of link().
+ * g13/g13.c: Make sure err is initialized.
+ * scd/scdaemon.c (main) [!USE_GCRY_THREAD_CBS]: Do not define ERR.
+
+ Fix last change: Only set gcrypt thread callback for older versions.
+ * dirmngr/dirmngr.c, g13/g13.c: Rename FIX_GCRY_PTH_INIT to
+ USE_GCRY_THREAD_CBS.
+
+2012-01-03 Werner Koch <wk at gnupg.org>
+
+ Terminate csh commands with a semicolon also for dirmngr.
+ * dirmngr/dirmngr.c (main): Terminate csh style output with a semicolon.
+
+ Terminate csh commands with a semicolon.
+ Fixes bug#1386.
+
+ * agent/gpg-agent.c (main): Terminate csh style output with a semicolon.
+ * scd/scdaemon.c: Ditto.
+
+2012-01-02 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ Only set gcrypt thread callback for older version of gcrypt.
+ * agent/gpg-agent.c, dirmngr/dirmngr.c, g13/g13.c, scd/scdaemon.c
+ (USE_GCRY_THREAD_CBS): New macro, defined if
+ GCRY_THREAD_OPTION_VERSION is 0.
+ (fixed_gcry_pth_init) [!USE_GCRY_THREAD_CBS]: Don't define.
+ (main) [!USE_GCRY_THREAD_CBS]: Do not install thread callbacks.
+
+2011-12-28 David Shaw <dshaw at jabberwocky.com>
+
+ Use the longest key ID available when talking to a HKP server.
+ This is issue 1340. Now that PKSD is dead, and SKS supports long key
+ IDs, this is safe to do. Patch from Daniel Kahn Gillmor
+ <dkg at fifthhorseman.net>.
+
+2011-12-20 Werner Koch <wk at gnupg.org>
+
+ Post-release version number update.
+
+ Release 2.1.0beta3.
+
+ Prepare for the beta3 release.
+
+ po: Update the German translation.
+
+ Add the STEED Self-Signing Nonthority certificate.
+ * doc/com-certs.pem: Install it when creating a keybox.
+
+ faq: Add section on US export restrictions.
+
+ Require Libassuan 2.0.3.
+ * configure.ac: Require Libassuan 2.0.3.
+ * agent/call-scd.c (ASSUAN_CONVEY_COMMENTS): Remove macro replacement.
+ * agent/command.c (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Remove
+ dependency.
+ (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Ditto.
+ * scd/command.c (cmd_killscd) [ASSUAN_FORCE_CLOSE]: Ditto.
+
+2011-12-20 NIIBE Yutaka <gniibe at fsij.org>
+
+ Add error log and debug log for pcsc_keypad_verify and pcsc_keypad_modify.
+ * scd/apdu.c (pcsc_keypad_verify): Add debug log and error log.
+ (pcsc_keypad_modify): Likewise.
+
+2011-12-19 Werner Koch <wk at gnupg.org>
+ Ben Kibbey <bjk at luxsci.net>
+
+ scd: Fix for card change returning GPG_ERR_CARD_RESET.
+ * scd/apdu.c (apdu_connect): Do not test for zero atrlen.
+
+2011-12-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ Don't kill pinentry by SIGKILL but let it quit by SIGINT.
+ * agent/call-pinentry.c (agent_popup_message_stop): To pinentry, send
+ SIGINT (was: SIGKILL).
+
+2011-12-15 David Shaw <dshaw at jabberwocky.com>
+
+ Merge fix for issue 1331 from 1.4.
+ * photoid.c (generate_photo_id): Check for the JPEG magic numbers
+ instead of JFIF since some programs generate an EXIF header first.
+
+2011-12-15 Werner Koch <wk at gnupg.org>
+
+ scd: Prefer application Geldkarte over DINSIG.
+ * scd/app.c (select_application): Reorder application tests.
+
+ scd: Add option --dump-atr to command APDU.
+ * scd/atr.c: Rewrite.
+ * scd/Makefile.am (scdaemon_SOURCES): Add atr.c and atr.h.
+ * scd/command.c (cmd_apdu): Add option --dump-atr.
+
+ estream: New function es_fclose_snatch.
+ * common/estream.c (cookie_ioctl_function_t): New type.
+ (es_fclose_snatch): New function.
+ (COOKIE_IOCTL_SNATCH_BUFFER): New constant.
+ (struct estream_internal): Add field FUNC_IOCTL.
+ (es_initialize): Clear FUNC_IOCTL.
+ (es_func_mem_ioctl): New function.
+ (es_fopenmem, es_fopenmem_init): Init FUNC_IOCTL.
+
+2011-12-14 Werner Koch <wk at gnupg.org>
+
+ scd: Skip S/N reading for the "undefined" application.
+ * scd/app.c (select_application): Skip serial number reading.
+
+ scd: Add more status word values for documentation.
+
+ scd: Add the "undefined" stub application.
+ * scd/app.c (select_application): Implement the "undefined"
+ application.
+
+ agent: Pass comment lines from scd verbatim thru gpg-agent.
+ * agent/call-scd.c (pass_status_thru): Pass comment lines verbatim.
+ * tools/gpg-connect-agent.c (help_cmd_p): New.
+ (main): Treat an "SCD HELP" the same as "HELP".
+
+ scd: Fix resetting and closing of the reader.
+ * scd/command.c (update_card_removed): Do no act on an invalid VRDR.
+ (do_reset): Ignore apdu_reset error codes for no and inactive card.
+ Close the reader before setting the slot to -1.
+ (update_reader_status_file): Notify the application before closing the
+ reader.
+
+ scd: Add debug option for reader function calls.
+ * scd/scdaemon.h (DBG_READER_VALUE, DBG_READER): New.
+ * scd/apdu.c (apdu_open_reader, apdu_close_reader)
+ (apdu_shutdown_reader, apdu_connect, apdu_disconnect)
+ (apdu_reset, apdu_get_atr, apdu_get_status): Add debug code.
+ (apdu_activate): Remove this unused function.
+
+2011-12-13 Werner Koch <wk at gnupg.org>
+
+ scd: New option --debug-assuan-log-cats.
+ * scd/scdaemon.c (oDebugAssuanLogCats): New.
+ (opts): Add option --debug-assuan-log-cats.
+ (main): Implement option.
+ * common/asshelp.c (set_libassuan_log_cats): New.
+
+ scd: Introduce a virtual reader table.
+ The vreader table makes the code more clear by explicitly talking
+ about APDU slots and reader indices. It also accommodates for future
+ extensions.
+
+ * scd/scdaemon.h (server_control_s): Remove READER_SLOT.
+ * scd/scdaemon.c (scd_init_default_ctrl): Do not init READER_SLOT.
+ * scd/app.c (check_application_conflict): Add arg SLOT.
+ * scd/command.c (slot_status_s): Rename to vreader_s.
+ (server_local_s): Add field VREADER_IDX as replacement for
+ the READER_SLOT in server_control_s. Change all users.
+ (slot_table): Rename to vreader_table. Change all users.
+ (vreader_slot): New.
+ (do_reset, cmd_apdu): Map vreader to apdu slot.
+ (get_reader_slot): Rename to get_current_reader. Return -1 on error.
+ (open_card): Map vreader toapdu slot. Pass slot to
+ check_application_conflict.
+ (scd_command_handler): Init VREADER_IDX.
+ (update_reader_status_file): Reset SLOT field on error.
+
+2011-12-12 Werner Koch <wk at gnupg.org>
+
+ scd: Retry command SERIALNO for an inactive card.
+ * scd/command.c (cmd_serialno): Retry once for an inactive card.
+
+ Fix detection of card removal and insertion.
+ * scd/apdu.c (apdu_connect): Return status codes for no card available
+ and inactive card.
+ * scd/command.c (TEST_CARD_REMOVAL): Also test for GPG_ERR_CARD_RESET.
+ (open_card): Map apdu_connect status to GPG_ERR_CARD_RESET.
+
+ gitlog-to-changelog: New option --tear-off.
+ * scripts/gitlog-to-changelog: Add option --tear-off.
+ * Makefile.am (gen-ChangeLog): Use that option.
+
+2011-12-07 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Add new validation model "steed".
+ * sm/gpgsm.h (VALIDATE_FLAG_STEED): New.
+ * sm/gpgsm.c (gpgsm_parse_validation_model): Add model "steed".
+ * sm/server.c (option_handler): Allow validation model "steed".
+ * sm/certlist.c (gpgsm_cert_has_well_known_private_key): New.
+ * sm/certchain.c (do_validate_chain): Handle the
+ well-known-private-key attribute. Support the "steed" model.
+ (gpgsm_validate_chain): Ditto.
+ * sm/verify.c (gpgsm_verify): Return "steed" in the trust status line.
+ * sm/keylist.c (list_cert_colon): Print the new 'w' flag.
+
+ Correct punctuation in the ChangeLog summary line.
+ * Makefile.am (gen-ChangeLog): Supply --append-dot.
+
+ Allow comments which will not show up in the ChangeLog.
+ * scripts/gitlog-to-changelog: Ignore lines after a "--" line.
+
+2011-12-06 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Allow specification of an AuthorityKeyIdentifier.
+ * sm/certreqgen.c (pAUTHKEYID): New.
+ (read_parameters): Add keyword Authority-Key-Id.
+ (proc_parameters): Check its value.
+ (create_request): Insert an Authority-Key-Id.
+
+ gpgsm: Allow arbitrary extensions for cert creation.
+ * sm/certreqgen.c (pSUBJKEYID, pEXTENSION): New.
+ (read_parameters): Add new keywords.
+ (proc_parameters): Check values of new keywords.
+ (create_request): Add SubjectKeyId and extensions.
+ (parse_parameter_usage): Support "cert" and the encrypt alias "encr".
+
+ gpgsm: Fix storing of the serial number.
+ * sm/certreqgen.c (create_request): Fix hex-bin conversion.
+
+2011-12-05 Werner Koch <wk at gnupg.org>
+
+ Fix last change.
+ * agent/command.c (start_command_handler): Remove use of removed var.
+
+ Amend the agent code with more comments.
+ * agent/command.c (server_local_s): Remove unused field MESSAGE_FD.
+
+2011-12-02 Werner Koch <wk at gnupg.org>
+
+ Support the Cherry ST-2000 card reader.
+ * scd/ccid-driver.c (SCM_SCR331, SCM_SCR331DI, SCM_SCR335)
+ (SCM_SCR3320, SCM_SPR532, CHERRY_ST2000): New constants.
+ (parse_ccid_descriptor): Use them.
+ (scan_or_find_usb_device, ccid_transceive_secure): Handle Cherry
+ ST-2000. Suggested by Matthias-Christian Ott.
+
+ Avoid possible double free in export.c.
+ * g10/export.c (transfer_format_to_openpgp): Avoid possible double
+ free of LIST. Reported by NIIBE Yutaka.
+
+2011-12-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ Fix pinpad input support for passphrase modification.
+ * apdu.c (pcsc_keypad_verify): Have dummy Lc field with value 0.
+ (pcsc_keypad_modify): Likewise.
+ (pcsc_keypad_modify): It's only for ISO7816_CHANGE_REFERENCE_DATA.
+ bConfirmPIN value is determined by the parameter p0.
+
+ * app-openpgp.c (do_change_pin): The flag use_keypad should be 0 when
+ reset_mode is on, or resetcode is on. use_keypad only makes sense for
+ iso7816_change_reference_data_kp.
+
+ * iso7816.h (iso7816_put_data_kp): Remove.
+ (iso7816_reset_retry_counter_kp): Remove.
+ (iso7816_reset_retry_counter_with_rc_kp): Remove.
+ (iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
+
+ * iso7816.c (iso7816_put_data_kp): Remove.
+ (iso7816_reset_retry_counter_kp): Remove.
+ (iso7816_reset_retry_counter_with_rc_kp): Remove.
+ (iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
+
+2011-12-01 Werner Koch <wk at gnupg.org>
+
+ Add hook to check the commit log syntax.
+ * autogen.sh: Install commit-msg hook for git.
+
+ Generate the ChangeLog from commit logs.
+ * scripts/gitlog-to-changelog: New script. Taken from gnulib.
+ * scripts/git-log-fix: New file.
+ * scripts/git-log-footer: New file.
+ * doc/HACKING: Describe the ChangeLog policy
+ * ChangeLog: New file.
+ * Makefile.am (EXTRA_DIST): Add new files.
+ (gen-ChangeLog): New.
+ (dist-hook): Run gen-ChangeLog.
+
+ Rename all ChangeLog files to ChangeLog-2011.
+
+2011-12-01 Werner Koch <wk at gnupg.org>
+
+ NB: Changes done before December 1st, 2011 are described in
+ per directory files named ChangeLog-2011. See doc/HACKING for
+ details.
+
+ -----
+ Copyright (C) 2011 Free Software Foundation, Inc.
+
+ Copying and distribution of this file and/or the original GIT
+ commit log messages, with or without modification, are
+ permitted provided the copyright notice and this notice are
+ preserved.
diff --cc INSTALL
index 5458714,5458714..0000000
deleted file mode 100644,100644
--- a/INSTALL
+++ /dev/null
@@@ -1,234 -1,234 +1,0 @@@
--Installation Instructions
--*************************
--
--Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006 Free Software Foundation, Inc.
--
--This file is free documentation; the Free Software Foundation gives
--unlimited permission to copy, distribute and modify it.
--
--Basic Installation
--==================
--
--Briefly, the shell commands `./configure; make; make install' should
--configure, build, and install this package. The following
--more-detailed instructions are generic; see the `README' file for
--instructions specific to this package.
--
-- The `configure' shell script attempts to guess correct values for
--various system-dependent variables used during compilation. It uses
--those values to create a `Makefile' in each directory of the package.
--It may also create one or more `.h' files containing system-dependent
--definitions. Finally, it creates a shell script `config.status' that
--you can run in the future to recreate the current configuration, and a
--file `config.log' containing compiler output (useful mainly for
--debugging `configure').
--
-- It can also use an optional file (typically called `config.cache'
--and enabled with `--cache-file=config.cache' or simply `-C') that saves
--the results of its tests to speed up reconfiguring. Caching is
--disabled by default to prevent problems with accidental use of stale
--cache files.
--
-- If you need to do unusual things to compile the package, please try
--to figure out how `configure' could check whether to do them, and mail
--diffs or instructions to the address given in the `README' so they can
--be considered for the next release. If you are using the cache, and at
--some point `config.cache' contains results you don't want to keep, you
--may remove or edit it.
--
-- The file `configure.ac' (or `configure.in') is used to create
--`configure' by a program called `autoconf'. You need `configure.ac' if
--you want to change it or regenerate `configure' using a newer version
--of `autoconf'.
--
--The simplest way to compile this package is:
--
-- 1. `cd' to the directory containing the package's source code and type
-- `./configure' to configure the package for your system.
--
-- Running `configure' might take a while. While running, it prints
-- some messages telling which features it is checking for.
--
-- 2. Type `make' to compile the package.
--
-- 3. Optionally, type `make check' to run any self-tests that come with
-- the package.
--
-- 4. Type `make install' to install the programs and any data files and
-- documentation.
--
-- 5. You can remove the program binaries and object files from the
-- source code directory by typing `make clean'. To also remove the
-- files that `configure' created (so you can compile the package for
-- a different kind of computer), type `make distclean'. There is
-- also a `make maintainer-clean' target, but that is intended mainly
-- for the package's developers. If you use it, you may have to get
-- all sorts of other programs in order to regenerate files that came
-- with the distribution.
--
--Compilers and Options
--=====================
--
--Some systems require unusual options for compilation or linking that the
--`configure' script does not know about. Run `./configure --help' for
--details on some of the pertinent environment variables.
--
-- You can give `configure' initial values for configuration parameters
--by setting variables in the command line or in the environment. Here
--is an example:
--
-- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
--
-- *Note Defining Variables::, for more details.
--
--Compiling For Multiple Architectures
--====================================
--
--You can compile the package for more than one kind of computer at the
--same time, by placing the object files for each architecture in their
--own directory. To do this, you can use GNU `make'. `cd' to the
--directory where you want the object files and executables to go and run
--the `configure' script. `configure' automatically checks for the
--source code in the directory that `configure' is in and in `..'.
--
-- With a non-GNU `make', it is safer to compile the package for one
--architecture at a time in the source code directory. After you have
--installed the package for one architecture, use `make distclean' before
--reconfiguring for another architecture.
--
--Installation Names
--==================
--
--By default, `make install' installs the package's commands under
--`/usr/local/bin', include files under `/usr/local/include', etc. You
--can specify an installation prefix other than `/usr/local' by giving
--`configure' the option `--prefix=PREFIX'.
--
-- You can specify separate installation prefixes for
--architecture-specific files and architecture-independent files. If you
--pass the option `--exec-prefix=PREFIX' to `configure', the package uses
--PREFIX as the prefix for installing programs and libraries.
--Documentation and other data files still use the regular prefix.
--
-- In addition, if you use an unusual directory layout you can give
--options like `--bindir=DIR' to specify different values for particular
--kinds of files. Run `configure --help' for a list of the directories
--you can set and what kinds of files go in them.
--
-- If the package supports it, you can cause programs to be installed
--with an extra prefix or suffix on their names by giving `configure' the
--option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
--
--Optional Features
--=================
--
--Some packages pay attention to `--enable-FEATURE' options to
--`configure', where FEATURE indicates an optional part of the package.
--They may also pay attention to `--with-PACKAGE' options, where PACKAGE
--is something like `gnu-as' or `x' (for the X Window System). The
--`README' should mention any `--enable-' and `--with-' options that the
--package recognizes.
--
-- For packages that use the X Window System, `configure' can usually
--find the X include and library files automatically, but if it doesn't,
--you can use the `configure' options `--x-includes=DIR' and
--`--x-libraries=DIR' to specify their locations.
--
--Specifying the System Type
--==========================
--
--There may be some features `configure' cannot figure out automatically,
--but needs to determine by the type of machine the package will run on.
--Usually, assuming the package is built to be run on the _same_
--architectures, `configure' can figure that out, but if it prints a
--message saying it cannot guess the machine type, give it the
--`--build=TYPE' option. TYPE can either be a short name for the system
--type, such as `sun4', or a canonical name which has the form:
--
-- CPU-COMPANY-SYSTEM
--
--where SYSTEM can have one of these forms:
--
-- OS KERNEL-OS
--
-- See the file `config.sub' for the possible values of each field. If
--`config.sub' isn't included in this package, then this package doesn't
--need to know the machine type.
--
-- If you are _building_ compiler tools for cross-compiling, you should
--use the option `--target=TYPE' to select the type of system they will
--produce code for.
--
-- If you want to _use_ a cross compiler, that generates code for a
--platform different from the build platform, you should specify the
--"host" platform (i.e., that on which the generated programs will
--eventually be run) with `--host=TYPE'.
--
--Sharing Defaults
--================
--
--If you want to set default values for `configure' scripts to share, you
--can create a site shell script called `config.site' that gives default
--values for variables like `CC', `cache_file', and `prefix'.
--`configure' looks for `PREFIX/share/config.site' if it exists, then
--`PREFIX/etc/config.site' if it exists. Or, you can set the
--`CONFIG_SITE' environment variable to the location of the site script.
--A warning: not all `configure' scripts look for a site script.
--
--Defining Variables
--==================
--
--Variables not defined in a site shell script can be set in the
--environment passed to `configure'. However, some packages may run
--configure again during the build, and the customized values of these
--variables may be lost. In order to avoid this problem, you should set
--them in the `configure' command line, using `VAR=value'. For example:
--
-- ./configure CC=/usr/local2/bin/gcc
--
--causes the specified `gcc' to be used as the C compiler (unless it is
--overridden in the site shell script).
--
--Unfortunately, this technique does not work for `CONFIG_SHELL' due to
--an Autoconf bug. Until the bug is fixed you can use this workaround:
--
-- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
--
--`configure' Invocation
--======================
--
--`configure' recognizes the following options to control how it operates.
--
--`--help'
--`-h'
-- Print a summary of the options to `configure', and exit.
--
--`--version'
--`-V'
-- Print the version of Autoconf used to generate the `configure'
-- script, and exit.
--
--`--cache-file=FILE'
-- Enable the cache: use and save the results of the tests in FILE,
-- traditionally `config.cache'. FILE defaults to `/dev/null' to
-- disable caching.
--
--`--config-cache'
--`-C'
-- Alias for `--cache-file=config.cache'.
--
--`--quiet'
--`--silent'
--`-q'
-- Do not print messages saying which checks are being made. To
-- suppress all normal output, redirect it to `/dev/null' (any error
-- messages will still be shown).
--
--`--srcdir=DIR'
-- Look for the package's source code in directory DIR. Usually
-- `configure' can determine that directory automatically.
--
--`configure' also accepts some other, not widely useful, options. Run
--`configure --help' for more details.
--
diff --cc VERSION
index a39c0b7,0000000..348fc11
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 2.1.11
++2.1.12
diff --cc build-aux/compile
index 531136b,531136b..0000000
deleted file mode 100755,100755
--- a/build-aux/compile
+++ /dev/null
@@@ -1,347 -1,347 +1,0 @@@
--#! /bin/sh
--# Wrapper for compilers which do not understand '-c -o'.
--
--scriptversion=2012-10-14.11; # UTC
--
--# Copyright (C) 1999-2013 Free Software Foundation, Inc.
--# Written by Tom Tromey <tromey at cygnus.com>.
--#
--# 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 2, 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/>.
--
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# This file is maintained in Automake, please report
--# bugs to <bug-automake at gnu.org> or send patches to
--# <automake-patches at gnu.org>.
--
--nl='
--'
--
--# We need space, tab and new line, in precisely that order. Quoting is
--# there to prevent tools from complaining about whitespace usage.
--IFS=" "" $nl"
--
--file_conv=
--
--# func_file_conv build_file lazy
--# Convert a $build file to $host form and store it in $file
--# Currently only supports Windows hosts. If the determined conversion
--# type is listed in (the comma separated) LAZY, no conversion will
--# take place.
--func_file_conv ()
--{
-- file=$1
-- case $file in
-- / | /[!/]*) # absolute file, and not a UNC file
-- if test -z "$file_conv"; then
-- # lazily determine how to convert abs files
-- case `uname -s` in
-- MINGW*)
-- file_conv=mingw
-- ;;
-- CYGWIN*)
-- file_conv=cygwin
-- ;;
-- *)
-- file_conv=wine
-- ;;
-- esac
-- fi
-- case $file_conv/,$2, in
-- *,$file_conv,*)
-- ;;
-- mingw/*)
-- file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-- ;;
-- cygwin/*)
-- file=`cygpath -m "$file" || echo "$file"`
-- ;;
-- wine/*)
-- file=`winepath -w "$file" || echo "$file"`
-- ;;
-- esac
-- ;;
-- esac
--}
--
--# func_cl_dashL linkdir
--# Make cl look for libraries in LINKDIR
--func_cl_dashL ()
--{
-- func_file_conv "$1"
-- if test -z "$lib_path"; then
-- lib_path=$file
-- else
-- lib_path="$lib_path;$file"
-- fi
-- linker_opts="$linker_opts -LIBPATH:$file"
--}
--
--# func_cl_dashl library
--# Do a library search-path lookup for cl
--func_cl_dashl ()
--{
-- lib=$1
-- found=no
-- save_IFS=$IFS
-- IFS=';'
-- for dir in $lib_path $LIB
-- do
-- IFS=$save_IFS
-- if $shared && test -f "$dir/$lib.dll.lib"; then
-- found=yes
-- lib=$dir/$lib.dll.lib
-- break
-- fi
-- if test -f "$dir/$lib.lib"; then
-- found=yes
-- lib=$dir/$lib.lib
-- break
-- fi
-- if test -f "$dir/lib$lib.a"; then
-- found=yes
-- lib=$dir/lib$lib.a
-- break
-- fi
-- done
-- IFS=$save_IFS
--
-- if test "$found" != yes; then
-- lib=$lib.lib
-- fi
--}
--
--# func_cl_wrapper cl arg...
--# Adjust compile command to suit cl
--func_cl_wrapper ()
--{
-- # Assume a capable shell
-- lib_path=
-- shared=:
-- linker_opts=
-- for arg
-- do
-- if test -n "$eat"; then
-- eat=
-- else
-- case $1 in
-- -o)
-- # configure might choose to run compile as 'compile cc -o foo foo.c'.
-- eat=1
-- case $2 in
-- *.o | *.[oO][bB][jJ])
-- func_file_conv "$2"
-- set x "$@" -Fo"$file"
-- shift
-- ;;
-- *)
-- func_file_conv "$2"
-- set x "$@" -Fe"$file"
-- shift
-- ;;
-- esac
-- ;;
-- -I)
-- eat=1
-- func_file_conv "$2" mingw
-- set x "$@" -I"$file"
-- shift
-- ;;
-- -I*)
-- func_file_conv "${1#-I}" mingw
-- set x "$@" -I"$file"
-- shift
-- ;;
-- -l)
-- eat=1
-- func_cl_dashl "$2"
-- set x "$@" "$lib"
-- shift
-- ;;
-- -l*)
-- func_cl_dashl "${1#-l}"
-- set x "$@" "$lib"
-- shift
-- ;;
-- -L)
-- eat=1
-- func_cl_dashL "$2"
-- ;;
-- -L*)
-- func_cl_dashL "${1#-L}"
-- ;;
-- -static)
-- shared=false
-- ;;
-- -Wl,*)
-- arg=${1#-Wl,}
-- save_ifs="$IFS"; IFS=','
-- for flag in $arg; do
-- IFS="$save_ifs"
-- linker_opts="$linker_opts $flag"
-- done
-- IFS="$save_ifs"
-- ;;
-- -Xlinker)
-- eat=1
-- linker_opts="$linker_opts $2"
-- ;;
-- -*)
-- set x "$@" "$1"
-- shift
-- ;;
-- *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-- func_file_conv "$1"
-- set x "$@" -Tp"$file"
-- shift
-- ;;
-- *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-- func_file_conv "$1" mingw
-- set x "$@" "$file"
-- shift
-- ;;
-- *)
-- set x "$@" "$1"
-- shift
-- ;;
-- esac
-- fi
-- shift
-- done
-- if test -n "$linker_opts"; then
-- linker_opts="-link$linker_opts"
-- fi
-- exec "$@" $linker_opts
-- exit 1
--}
--
--eat=
--
--case $1 in
-- '')
-- echo "$0: No command. Try '$0 --help' for more information." 1>&2
-- exit 1;
-- ;;
-- -h | --h*)
-- cat <<\EOF
--Usage: compile [--help] [--version] PROGRAM [ARGS]
--
--Wrapper for compilers which do not understand '-c -o'.
--Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
--arguments, and rename the output as expected.
--
--If you are trying to build a whole package this is not the
--right script to run: please start by reading the file 'INSTALL'.
--
--Report bugs to <bug-automake at gnu.org>.
--EOF
-- exit $?
-- ;;
-- -v | --v*)
-- echo "compile $scriptversion"
-- exit $?
-- ;;
-- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-- func_cl_wrapper "$@" # Doesn't return...
-- ;;
--esac
--
--ofile=
--cfile=
--
--for arg
--do
-- if test -n "$eat"; then
-- eat=
-- else
-- case $1 in
-- -o)
-- # configure might choose to run compile as 'compile cc -o foo foo.c'.
-- # So we strip '-o arg' only if arg is an object.
-- eat=1
-- case $2 in
-- *.o | *.obj)
-- ofile=$2
-- ;;
-- *)
-- set x "$@" -o "$2"
-- shift
-- ;;
-- esac
-- ;;
-- *.c)
-- cfile=$1
-- set x "$@" "$1"
-- shift
-- ;;
-- *)
-- set x "$@" "$1"
-- shift
-- ;;
-- esac
-- fi
-- shift
--done
--
--if test -z "$ofile" || test -z "$cfile"; then
-- # If no '-o' option was seen then we might have been invoked from a
-- # pattern rule where we don't need one. That is ok -- this is a
-- # normal compilation that the losing compiler can handle. If no
-- # '.c' file was seen then we are probably linking. That is also
-- # ok.
-- exec "$@"
--fi
--
--# Name of file we expect compiler to create.
--cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
--
--# Create the lock directory.
--# Note: use '[/\\:.-]' here to ensure that we don't use the same name
--# that we are using for the .o file. Also, base the name on the expected
--# object file name, since that is what matters with a parallel build.
--lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
--while true; do
-- if mkdir "$lockdir" >/dev/null 2>&1; then
-- break
-- fi
-- sleep 1
--done
--# FIXME: race condition here if user kills between mkdir and trap.
--trap "rmdir '$lockdir'; exit 1" 1 2 15
--
--# Run the compile.
--"$@"
--ret=$?
--
--if test -f "$cofile"; then
-- test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
--elif test -f "${cofile}bj"; then
-- test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
--fi
--
--rmdir "$lockdir"
--exit $ret
--
--# Local Variables:
--# mode: shell-script
--# sh-indentation: 2
--# eval: (add-hook 'write-file-hooks 'time-stamp)
--# time-stamp-start: "scriptversion="
--# time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
--# End:
diff --cc build-aux/config.rpath
index c38b914,c38b914..0000000
deleted file mode 100755,100755
--- a/build-aux/config.rpath
+++ /dev/null
@@@ -1,690 -1,690 +1,0 @@@
--#! /bin/sh
--# Output a system dependent set of variables, describing how to set the
--# run time search path of shared libraries in an executable.
--#
--# Copyright 1996-2013 Free Software Foundation, Inc.
--# Taken from GNU libtool, 2001
--# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
--#
--# This file 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.
--#
--# The first argument passed to this file is the canonical host specification,
--# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
--# or
--# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
--# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
--# should be set by the caller.
--#
--# The set of defined variables is at the end of this script.
--
--# Known limitations:
--# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
--# than 256 bytes, otherwise the compiler driver will dump core. The only
--# known workaround is to choose shorter directory names for the build
--# directory and/or the installation directory.
--
--# All known linkers require a '.a' archive for static linking (except MSVC,
--# which needs '.lib').
--libext=a
--shrext=.so
--
--host="$1"
--host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--
--# Code taken from libtool.m4's _LT_CC_BASENAME.
--
--for cc_temp in $CC""; do
-- case $cc_temp in
-- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-- \-*) ;;
-- *) break;;
-- esac
--done
--cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
--
--# Code taken from libtool.m4's _LT_COMPILER_PIC.
--
--wl=
--if test "$GCC" = yes; then
-- wl='-Wl,'
--else
-- case "$host_os" in
-- aix*)
-- wl='-Wl,'
-- ;;
-- mingw* | cygwin* | pw32* | os2* | cegcc*)
-- ;;
-- hpux9* | hpux10* | hpux11*)
-- wl='-Wl,'
-- ;;
-- irix5* | irix6* | nonstopux*)
-- wl='-Wl,'
-- ;;
-- linux* | k*bsd*-gnu | kopensolaris*-gnu)
-- case $cc_basename in
-- ecc*)
-- wl='-Wl,'
-- ;;
-- icc* | ifort*)
-- wl='-Wl,'
-- ;;
-- lf95*)
-- wl='-Wl,'
-- ;;
-- nagfor*)
-- wl='-Wl,-Wl,,'
-- ;;
-- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-- wl='-Wl,'
-- ;;
-- ccc*)
-- wl='-Wl,'
-- ;;
-- xl* | bgxl* | bgf* | mpixl*)
-- wl='-Wl,'
-- ;;
-- como)
-- wl='-lopt='
-- ;;
-- *)
-- case `$CC -V 2>&1 | sed 5q` in
-- *Sun\ F* | *Sun*Fortran*)
-- wl=
-- ;;
-- *Sun\ C*)
-- wl='-Wl,'
-- ;;
-- esac
-- ;;
-- esac
-- ;;
-- newsos6)
-- ;;
-- *nto* | *qnx*)
-- ;;
-- osf3* | osf4* | osf5*)
-- wl='-Wl,'
-- ;;
-- rdos*)
-- ;;
-- solaris*)
-- case $cc_basename in
-- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-- wl='-Qoption ld '
-- ;;
-- *)
-- wl='-Wl,'
-- ;;
-- esac
-- ;;
-- sunos4*)
-- wl='-Qoption ld '
-- ;;
-- sysv4 | sysv4.2uw2* | sysv4.3*)
-- wl='-Wl,'
-- ;;
-- sysv4*MP*)
-- ;;
-- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-- wl='-Wl,'
-- ;;
-- unicos*)
-- wl='-Wl,'
-- ;;
-- uts4*)
-- ;;
-- esac
--fi
--
--# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
--
--hardcode_libdir_flag_spec=
--hardcode_libdir_separator=
--hardcode_direct=no
--hardcode_minus_L=no
--
--case "$host_os" in
-- cygwin* | mingw* | pw32* | cegcc*)
-- # FIXME: the MSVC++ port hasn't been tested in a loooong time
-- # When not using gcc, we currently assume that we are using
-- # Microsoft Visual C++.
-- if test "$GCC" != yes; then
-- with_gnu_ld=no
-- fi
-- ;;
-- interix*)
-- # we just hope/assume this is gcc and not c89 (= MSVC++)
-- with_gnu_ld=yes
-- ;;
-- openbsd*)
-- with_gnu_ld=no
-- ;;
--esac
--
--ld_shlibs=yes
--if test "$with_gnu_ld" = yes; then
-- # Set some defaults for GNU ld with shared library support. These
-- # are reset later if shared libraries are not supported. Putting them
-- # here allows them to be overridden if necessary.
-- # Unlike libtool, we use -rpath here, not --rpath, since the documented
-- # option of GNU ld is called -rpath, not --rpath.
-- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-- case "$host_os" in
-- aix[3-9]*)
-- # On AIX/PPC, the GNU linker is very broken
-- if test "$host_cpu" != ia64; then
-- ld_shlibs=no
-- fi
-- ;;
-- amigaos*)
-- case "$host_cpu" in
-- powerpc)
-- ;;
-- m68k)
-- hardcode_libdir_flag_spec='-L$libdir'
-- hardcode_minus_L=yes
-- ;;
-- esac
-- ;;
-- beos*)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- :
-- else
-- ld_shlibs=no
-- fi
-- ;;
-- cygwin* | mingw* | pw32* | cegcc*)
-- # hardcode_libdir_flag_spec is actually meaningless, as there is
-- # no search path for DLLs.
-- hardcode_libdir_flag_spec='-L$libdir'
-- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-- :
-- else
-- ld_shlibs=no
-- fi
-- ;;
-- haiku*)
-- ;;
-- interix[3-9]*)
-- hardcode_direct=no
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- ;;
-- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- :
-- else
-- ld_shlibs=no
-- fi
-- ;;
-- netbsd*)
-- ;;
-- solaris*)
-- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-- ld_shlibs=no
-- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- :
-- else
-- ld_shlibs=no
-- fi
-- ;;
-- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-- case `$LD -v 2>&1` in
-- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-- ld_shlibs=no
-- ;;
-- *)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-- else
-- ld_shlibs=no
-- fi
-- ;;
-- esac
-- ;;
-- sunos4*)
-- hardcode_direct=yes
-- ;;
-- *)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- :
-- else
-- ld_shlibs=no
-- fi
-- ;;
-- esac
-- if test "$ld_shlibs" = no; then
-- hardcode_libdir_flag_spec=
-- fi
--else
-- case "$host_os" in
-- aix3*)
-- # Note: this linker hardcodes the directories in LIBPATH if there
-- # are no directories specified by -L.
-- hardcode_minus_L=yes
-- if test "$GCC" = yes; then
-- # Neither direct hardcoding nor static linking is supported with a
-- # broken collect2.
-- hardcode_direct=unsupported
-- fi
-- ;;
-- aix[4-9]*)
-- if test "$host_cpu" = ia64; then
-- # On IA64, the linker does run time linking by default, so we don't
-- # have to do anything special.
-- aix_use_runtimelinking=no
-- else
-- aix_use_runtimelinking=no
-- # Test if we are trying to use run time linking or normal
-- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-- for ld_flag in $LDFLAGS; do
-- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-- aix_use_runtimelinking=yes
-- break
-- fi
-- done
-- ;;
-- esac
-- fi
-- hardcode_direct=yes
-- hardcode_libdir_separator=':'
-- if test "$GCC" = yes; then
-- case $host_os in aix4.[012]|aix4.[012].*)
-- collect2name=`${CC} -print-prog-name=collect2`
-- if test -f "$collect2name" && \
-- strings "$collect2name" | grep resolve_lib_name >/dev/null
-- then
-- # We have reworked collect2
-- :
-- else
-- # We have old collect2
-- hardcode_direct=unsupported
-- hardcode_minus_L=yes
-- hardcode_libdir_flag_spec='-L$libdir'
-- hardcode_libdir_separator=
-- fi
-- ;;
-- esac
-- fi
-- # Begin _LT_AC_SYS_LIBPATH_AIX.
-- echo 'int main () { return 0; }' > conftest.c
-- ${CC} ${LDFLAGS} conftest.c -o conftest
-- aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-- if test -z "$aix_libpath"; then
-- aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-- fi
-- if test -z "$aix_libpath"; then
-- aix_libpath="/usr/lib:/lib"
-- fi
-- rm -f conftest.c conftest
-- # End _LT_AC_SYS_LIBPATH_AIX.
-- if test "$aix_use_runtimelinking" = yes; then
-- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-- else
-- if test "$host_cpu" = ia64; then
-- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-- else
-- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-- fi
-- fi
-- ;;
-- amigaos*)
-- case "$host_cpu" in
-- powerpc)
-- ;;
-- m68k)
-- hardcode_libdir_flag_spec='-L$libdir'
-- hardcode_minus_L=yes
-- ;;
-- esac
-- ;;
-- bsdi[45]*)
-- ;;
-- cygwin* | mingw* | pw32* | cegcc*)
-- # When not using gcc, we currently assume that we are using
-- # Microsoft Visual C++.
-- # hardcode_libdir_flag_spec is actually meaningless, as there is
-- # no search path for DLLs.
-- hardcode_libdir_flag_spec=' '
-- libext=lib
-- ;;
-- darwin* | rhapsody*)
-- hardcode_direct=no
-- if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
-- :
-- else
-- ld_shlibs=no
-- fi
-- ;;
-- dgux*)
-- hardcode_libdir_flag_spec='-L$libdir'
-- ;;
-- freebsd2.2*)
-- hardcode_libdir_flag_spec='-R$libdir'
-- hardcode_direct=yes
-- ;;
-- freebsd2*)
-- hardcode_direct=yes
-- hardcode_minus_L=yes
-- ;;
-- freebsd* | dragonfly*)
-- hardcode_libdir_flag_spec='-R$libdir'
-- hardcode_direct=yes
-- ;;
-- hpux9*)
-- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-- hardcode_libdir_separator=:
-- hardcode_direct=yes
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- hardcode_minus_L=yes
-- ;;
-- hpux10*)
-- if test "$with_gnu_ld" = no; then
-- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-- hardcode_libdir_separator=:
-- hardcode_direct=yes
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- hardcode_minus_L=yes
-- fi
-- ;;
-- hpux11*)
-- if test "$with_gnu_ld" = no; then
-- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-- hardcode_libdir_separator=:
-- case $host_cpu in
-- hppa*64*|ia64*)
-- hardcode_direct=no
-- ;;
-- *)
-- hardcode_direct=yes
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- hardcode_minus_L=yes
-- ;;
-- esac
-- fi
-- ;;
-- irix5* | irix6* | nonstopux*)
-- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-- hardcode_libdir_separator=:
-- ;;
-- netbsd*)
-- hardcode_libdir_flag_spec='-R$libdir'
-- hardcode_direct=yes
-- ;;
-- newsos6)
-- hardcode_direct=yes
-- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-- hardcode_libdir_separator=:
-- ;;
-- *nto* | *qnx*)
-- ;;
-- openbsd*)
-- if test -f /usr/libexec/ld.so; then
-- hardcode_direct=yes
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- else
-- case "$host_os" in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- hardcode_libdir_flag_spec='-R$libdir'
-- ;;
-- *)
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- ;;
-- esac
-- fi
-- else
-- ld_shlibs=no
-- fi
-- ;;
-- os2*)
-- hardcode_libdir_flag_spec='-L$libdir'
-- hardcode_minus_L=yes
-- ;;
-- osf3*)
-- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-- hardcode_libdir_separator=:
-- ;;
-- osf4* | osf5*)
-- if test "$GCC" = yes; then
-- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-- else
-- # Both cc and cxx compiler support -rpath directly
-- hardcode_libdir_flag_spec='-rpath $libdir'
-- fi
-- hardcode_libdir_separator=:
-- ;;
-- solaris*)
-- hardcode_libdir_flag_spec='-R$libdir'
-- ;;
-- sunos4*)
-- hardcode_libdir_flag_spec='-L$libdir'
-- hardcode_direct=yes
-- hardcode_minus_L=yes
-- ;;
-- sysv4)
-- case $host_vendor in
-- sni)
-- hardcode_direct=yes # is this really true???
-- ;;
-- siemens)
-- hardcode_direct=no
-- ;;
-- motorola)
-- hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-- ;;
-- esac
-- ;;
-- sysv4.3*)
-- ;;
-- sysv4*MP*)
-- if test -d /usr/nec; then
-- ld_shlibs=yes
-- fi
-- ;;
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-- ;;
-- sysv5* | sco3.2v5* | sco5v6*)
-- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-- hardcode_libdir_separator=':'
-- ;;
-- uts4*)
-- hardcode_libdir_flag_spec='-L$libdir'
-- ;;
-- *)
-- ld_shlibs=no
-- ;;
-- esac
--fi
--
--# Check dynamic linker characteristics
--# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
--# Unlike libtool.m4, here we don't care about _all_ names of the library, but
--# only about the one the linker finds when passed -lNAME. This is the last
--# element of library_names_spec in libtool.m4, or possibly two of them if the
--# linker has special search rules.
--library_names_spec= # the last element of library_names_spec in libtool.m4
--libname_spec='lib$name'
--case "$host_os" in
-- aix3*)
-- library_names_spec='$libname.a'
-- ;;
-- aix[4-9]*)
-- library_names_spec='$libname$shrext'
-- ;;
-- amigaos*)
-- case "$host_cpu" in
-- powerpc*)
-- library_names_spec='$libname$shrext' ;;
-- m68k)
-- library_names_spec='$libname.a' ;;
-- esac
-- ;;
-- beos*)
-- library_names_spec='$libname$shrext'
-- ;;
-- bsdi[45]*)
-- library_names_spec='$libname$shrext'
-- ;;
-- cygwin* | mingw* | pw32* | cegcc*)
-- shrext=.dll
-- library_names_spec='$libname.dll.a $libname.lib'
-- ;;
-- darwin* | rhapsody*)
-- shrext=.dylib
-- library_names_spec='$libname$shrext'
-- ;;
-- dgux*)
-- library_names_spec='$libname$shrext'
-- ;;
-- freebsd* | dragonfly*)
-- case "$host_os" in
-- freebsd[123]*)
-- library_names_spec='$libname$shrext$versuffix' ;;
-- *)
-- library_names_spec='$libname$shrext' ;;
-- esac
-- ;;
-- gnu*)
-- library_names_spec='$libname$shrext'
-- ;;
-- haiku*)
-- library_names_spec='$libname$shrext'
-- ;;
-- hpux9* | hpux10* | hpux11*)
-- case $host_cpu in
-- ia64*)
-- shrext=.so
-- ;;
-- hppa*64*)
-- shrext=.sl
-- ;;
-- *)
-- shrext=.sl
-- ;;
-- esac
-- library_names_spec='$libname$shrext'
-- ;;
-- interix[3-9]*)
-- library_names_spec='$libname$shrext'
-- ;;
-- irix5* | irix6* | nonstopux*)
-- library_names_spec='$libname$shrext'
-- case "$host_os" in
-- irix5* | nonstopux*)
-- libsuff= shlibsuff=
-- ;;
-- *)
-- case $LD in
-- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
-- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
-- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
-- *) libsuff= shlibsuff= ;;
-- esac
-- ;;
-- esac
-- ;;
-- linux*oldld* | linux*aout* | linux*coff*)
-- ;;
-- linux* | k*bsd*-gnu | kopensolaris*-gnu)
-- library_names_spec='$libname$shrext'
-- ;;
-- knetbsd*-gnu)
-- library_names_spec='$libname$shrext'
-- ;;
-- netbsd*)
-- library_names_spec='$libname$shrext'
-- ;;
-- newsos6)
-- library_names_spec='$libname$shrext'
-- ;;
-- *nto* | *qnx*)
-- library_names_spec='$libname$shrext'
-- ;;
-- openbsd*)
-- library_names_spec='$libname$shrext$versuffix'
-- ;;
-- os2*)
-- libname_spec='$name'
-- shrext=.dll
-- library_names_spec='$libname.a'
-- ;;
-- osf3* | osf4* | osf5*)
-- library_names_spec='$libname$shrext'
-- ;;
-- rdos*)
-- ;;
-- solaris*)
-- library_names_spec='$libname$shrext'
-- ;;
-- sunos4*)
-- library_names_spec='$libname$shrext$versuffix'
-- ;;
-- sysv4 | sysv4.3*)
-- library_names_spec='$libname$shrext'
-- ;;
-- sysv4*MP*)
-- library_names_spec='$libname$shrext'
-- ;;
-- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-- library_names_spec='$libname$shrext'
-- ;;
-- tpf*)
-- library_names_spec='$libname$shrext'
-- ;;
-- uts4*)
-- library_names_spec='$libname$shrext'
-- ;;
--esac
--
--sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
--escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
--shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
--escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
--escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
--escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
--
--LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
--
--# How to pass a linker flag through the compiler.
--wl="$escaped_wl"
--
--# Static library suffix (normally "a").
--libext="$libext"
--
--# Shared library suffix (normally "so").
--shlibext="$shlibext"
--
--# Format of library name prefix.
--libname_spec="$escaped_libname_spec"
--
--# Library names that the linker finds when passed -lNAME.
--library_names_spec="$escaped_library_names_spec"
--
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator="$hardcode_libdir_separator"
--
--# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct="$hardcode_direct"
--
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L="$hardcode_minus_L"
--
--EOF
diff --cc build-aux/depcomp
index 4ebd5b3,4ebd5b3..0000000
deleted file mode 100755,100755
--- a/build-aux/depcomp
+++ /dev/null
@@@ -1,791 -1,791 +1,0 @@@
--#! /bin/sh
--# depcomp - compile a program generating dependencies as side-effects
--
--scriptversion=2013-05-30.07; # UTC
--
--# Copyright (C) 1999-2013 Free Software Foundation, Inc.
--
--# 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 2, 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/>.
--
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
--
--case $1 in
-- '')
-- echo "$0: No command. Try '$0 --help' for more information." 1>&2
-- exit 1;
-- ;;
-- -h | --h*)
-- cat <<\EOF
--Usage: depcomp [--help] [--version] PROGRAM [ARGS]
--
--Run PROGRAMS ARGS to compile a file, generating dependencies
--as side-effects.
--
--Environment variables:
-- depmode Dependency tracking mode.
-- source Source file read by 'PROGRAMS ARGS'.
-- object Object file output by 'PROGRAMS ARGS'.
-- DEPDIR directory where to store dependencies.
-- depfile Dependency file to output.
-- tmpdepfile Temporary file to use when outputting dependencies.
-- libtool Whether libtool is used (yes/no).
--
--Report bugs to <bug-automake at gnu.org>.
--EOF
-- exit $?
-- ;;
-- -v | --v*)
-- echo "depcomp $scriptversion"
-- exit $?
-- ;;
--esac
--
--# Get the directory component of the given path, and save it in the
--# global variables '$dir'. Note that this directory component will
--# be either empty or ending with a '/' character. This is deliberate.
--set_dir_from ()
--{
-- case $1 in
-- */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
-- *) dir=;;
-- esac
--}
--
--# Get the suffix-stripped basename of the given path, and save it the
--# global variable '$base'.
--set_base_from ()
--{
-- base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
--}
--
--# If no dependency file was actually created by the compiler invocation,
--# we still have to create a dummy depfile, to avoid errors with the
--# Makefile "include basename.Plo" scheme.
--make_dummy_depfile ()
--{
-- echo "#dummy" > "$depfile"
--}
--
--# Factor out some common post-processing of the generated depfile.
--# Requires the auxiliary global variable '$tmpdepfile' to be set.
--aix_post_process_depfile ()
--{
-- # If the compiler actually managed to produce a dependency file,
-- # post-process it.
-- if test -f "$tmpdepfile"; then
-- # Each line is of the form 'foo.o: dependency.h'.
-- # Do two passes, one to just change these to
-- # $object: dependency.h
-- # and one to simply output
-- # dependency.h:
-- # which is needed to avoid the deleted-header problem.
-- { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
-- sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
-- } > "$depfile"
-- rm -f "$tmpdepfile"
-- else
-- make_dummy_depfile
-- fi
--}
--
--# A tabulation character.
--tab=' '
--# A newline character.
--nl='
--'
--# Character ranges might be problematic outside the C locale.
--# These definitions help.
--upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
--lower=abcdefghijklmnopqrstuvwxyz
--digits=0123456789
--alpha=${upper}${lower}
--
--if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-- echo "depcomp: Variables source, object and depmode must be set" 1>&2
-- exit 1
--fi
--
--# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
--depfile=${depfile-`echo "$object" |
-- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
--tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
--
--rm -f "$tmpdepfile"
--
--# Avoid interferences from the environment.
--gccflag= dashmflag=
--
--# Some modes work just like other modes, but use different flags. We
--# parameterize here, but still list the modes in the big case below,
--# to make depend.m4 easier to write. Note that we *cannot* use a case
--# here, because this file can only contain one case statement.
--if test "$depmode" = hp; then
-- # HP compiler uses -M and no extra arg.
-- gccflag=-M
-- depmode=gcc
--fi
--
--if test "$depmode" = dashXmstdout; then
-- # This is just like dashmstdout with a different argument.
-- dashmflag=-xM
-- depmode=dashmstdout
--fi
--
--cygpath_u="cygpath -u -f -"
--if test "$depmode" = msvcmsys; then
-- # This is just like msvisualcpp but w/o cygpath translation.
-- # Just convert the backslash-escaped backslashes to single forward
-- # slashes to satisfy depend.m4
-- cygpath_u='sed s,\\\\,/,g'
-- depmode=msvisualcpp
--fi
--
--if test "$depmode" = msvc7msys; then
-- # This is just like msvc7 but w/o cygpath translation.
-- # Just convert the backslash-escaped backslashes to single forward
-- # slashes to satisfy depend.m4
-- cygpath_u='sed s,\\\\,/,g'
-- depmode=msvc7
--fi
--
--if test "$depmode" = xlc; then
-- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
-- gccflag=-qmakedep=gcc,-MF
-- depmode=gcc
--fi
--
--case "$depmode" in
--gcc3)
--## gcc 3 implements dependency tracking that does exactly what
--## we want. Yay! Note: for some reason libtool 1.4 doesn't like
--## it if -MD -MP comes after the -MF stuff. Hmm.
--## Unfortunately, FreeBSD c89 acceptance of flags depends upon
--## the command line argument order; so add the flags where they
--## appear in depend2.am. Note that the slowdown incurred here
--## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-- for arg
-- do
-- case $arg in
-- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-- *) set fnord "$@" "$arg" ;;
-- esac
-- shift # fnord
-- shift # $arg
-- done
-- "$@"
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- mv "$tmpdepfile" "$depfile"
-- ;;
--
--gcc)
--## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
--## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
--## (see the conditional assignment to $gccflag above).
--## There are various ways to get dependency output from gcc. Here's
--## why we pick this rather obscure method:
--## - Don't want to use -MD because we'd like the dependencies to end
--## up in a subdir. Having to rename by hand is ugly.
--## (We might end up doing this anyway to support other compilers.)
--## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
--## -MM, not -M (despite what the docs say). Also, it might not be
--## supported by the other compilers which use the 'gcc' depmode.
--## - Using -M directly means running the compiler twice (even worse
--## than renaming).
-- if test -z "$gccflag"; then
-- gccflag=-MD,
-- fi
-- "$@" -Wp,"$gccflag$tmpdepfile"
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- rm -f "$depfile"
-- echo "$object : \\" > "$depfile"
-- # The second -e expression handles DOS-style file names with drive
-- # letters.
-- sed -e 's/^[^:]*: / /' \
-- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
--## This next piece of magic avoids the "deleted header file" problem.
--## The problem is that when a header file which appears in a .P file
--## is deleted, the dependency causes make to die (because there is
--## typically no way to rebuild the header). We avoid this by adding
--## dummy dependencies for each header file. Too bad gcc doesn't do
--## this for us directly.
--## Some versions of gcc put a space before the ':'. On the theory
--## that the space means something, we add a space to the output as
--## well. hp depmode also adds that space, but also prefixes the VPATH
--## to the object. Take care to not repeat it in the output.
--## Some versions of the HPUX 10.20 sed can't process this invocation
--## correctly. Breaking it into two sed invocations is a workaround.
-- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-- | sed -e 's/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--hp)
-- # This case exists only to let depend.m4 do its work. It works by
-- # looking at the text of this script. This case will never be run,
-- # since it is checked for above.
-- exit 1
-- ;;
--
--sgi)
-- if test "$libtool" = yes; then
-- "$@" "-Wp,-MDupdate,$tmpdepfile"
-- else
-- "$@" -MDupdate "$tmpdepfile"
-- fi
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- rm -f "$depfile"
--
-- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
-- echo "$object : \\" > "$depfile"
-- # Clip off the initial element (the dependent). Don't try to be
-- # clever and replace this with sed code, as IRIX sed won't handle
-- # lines with more than a fixed number of characters (4096 in
-- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
-- # the IRIX cc adds comments like '#:fec' to the end of the
-- # dependency line.
-- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
-- | tr "$nl" ' ' >> "$depfile"
-- echo >> "$depfile"
-- # The second pass generates a dummy entry for each header file.
-- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-- >> "$depfile"
-- else
-- make_dummy_depfile
-- fi
-- rm -f "$tmpdepfile"
-- ;;
--
--xlc)
-- # This case exists only to let depend.m4 do its work. It works by
-- # looking at the text of this script. This case will never be run,
-- # since it is checked for above.
-- exit 1
-- ;;
--
--aix)
-- # The C for AIX Compiler uses -M and outputs the dependencies
-- # in a .u file. In older versions, this file always lives in the
-- # current directory. Also, the AIX compiler puts '$object:' at the
-- # start of each line; $object doesn't have directory information.
-- # Version 6 uses the directory in both cases.
-- set_dir_from "$object"
-- set_base_from "$object"
-- if test "$libtool" = yes; then
-- tmpdepfile1=$dir$base.u
-- tmpdepfile2=$base.u
-- tmpdepfile3=$dir.libs/$base.u
-- "$@" -Wc,-M
-- else
-- tmpdepfile1=$dir$base.u
-- tmpdepfile2=$dir$base.u
-- tmpdepfile3=$dir$base.u
-- "$@" -M
-- fi
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-- exit $stat
-- fi
--
-- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-- do
-- test -f "$tmpdepfile" && break
-- done
-- aix_post_process_depfile
-- ;;
--
--tcc)
-- # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
-- # FIXME: That version still under development at the moment of writing.
-- # Make that this statement remains true also for stable, released
-- # versions.
-- # It will wrap lines (doesn't matter whether long or short) with a
-- # trailing '\', as in:
-- #
-- # foo.o : \
-- # foo.c \
-- # foo.h \
-- #
-- # It will put a trailing '\' even on the last line, and will use leading
-- # spaces rather than leading tabs (at least since its commit 0394caf7
-- # "Emit spaces for -MD").
-- "$@" -MD -MF "$tmpdepfile"
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- rm -f "$depfile"
-- # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
-- # We have to change lines of the first kind to '$object: \'.
-- sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
-- # And for each line of the second kind, we have to emit a 'dep.h:'
-- # dummy dependency, to avoid the deleted-header problem.
-- sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--## The order of this option in the case statement is important, since the
--## shell code in configure will try each of these formats in the order
--## listed in this file. A plain '-MD' option would be understood by many
--## compilers, so we must ensure this comes after the gcc and icc options.
--pgcc)
-- # Portland's C compiler understands '-MD'.
-- # Will always output deps to 'file.d' where file is the root name of the
-- # source file under compilation, even if file resides in a subdirectory.
-- # The object file name does not affect the name of the '.d' file.
-- # pgcc 10.2 will output
-- # foo.o: sub/foo.c sub/foo.h
-- # and will wrap long lines using '\' :
-- # foo.o: sub/foo.c ... \
-- # sub/foo.h ... \
-- # ...
-- set_dir_from "$object"
-- # Use the source, not the object, to determine the base name, since
-- # that's sadly what pgcc will do too.
-- set_base_from "$source"
-- tmpdepfile=$base.d
--
-- # For projects that build the same source file twice into different object
-- # files, the pgcc approach of using the *source* file root name can cause
-- # problems in parallel builds. Use a locking strategy to avoid stomping on
-- # the same $tmpdepfile.
-- lockdir=$base.d-lock
-- trap "
-- echo '$0: caught signal, cleaning up...' >&2
-- rmdir '$lockdir'
-- exit 1
-- " 1 2 13 15
-- numtries=100
-- i=$numtries
-- while test $i -gt 0; do
-- # mkdir is a portable test-and-set.
-- if mkdir "$lockdir" 2>/dev/null; then
-- # This process acquired the lock.
-- "$@" -MD
-- stat=$?
-- # Release the lock.
-- rmdir "$lockdir"
-- break
-- else
-- # If the lock is being held by a different process, wait
-- # until the winning process is done or we timeout.
-- while test -d "$lockdir" && test $i -gt 0; do
-- sleep 1
-- i=`expr $i - 1`
-- done
-- fi
-- i=`expr $i - 1`
-- done
-- trap - 1 2 13 15
-- if test $i -le 0; then
-- echo "$0: failed to acquire lock after $numtries attempts" >&2
-- echo "$0: check lockdir '$lockdir'" >&2
-- exit 1
-- fi
--
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- rm -f "$depfile"
-- # Each line is of the form `foo.o: dependent.h',
-- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-- # Do two passes, one to just change these to
-- # `$object: dependent.h' and one to simply `dependent.h:'.
-- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-- # Some versions of the HPUX 10.20 sed can't process this invocation
-- # correctly. Breaking it into two sed invocations is a workaround.
-- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
-- | sed -e 's/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--hp2)
-- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-- # compilers, which have integrated preprocessors. The correct option
-- # to use with these is +Maked; it writes dependencies to a file named
-- # 'foo.d', which lands next to the object file, wherever that
-- # happens to be.
-- # Much of this is similar to the tru64 case; see comments there.
-- set_dir_from "$object"
-- set_base_from "$object"
-- if test "$libtool" = yes; then
-- tmpdepfile1=$dir$base.d
-- tmpdepfile2=$dir.libs/$base.d
-- "$@" -Wc,+Maked
-- else
-- tmpdepfile1=$dir$base.d
-- tmpdepfile2=$dir$base.d
-- "$@" +Maked
-- fi
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile1" "$tmpdepfile2"
-- exit $stat
-- fi
--
-- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-- do
-- test -f "$tmpdepfile" && break
-- done
-- if test -f "$tmpdepfile"; then
-- sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
-- # Add 'dependent.h:' lines.
-- sed -ne '2,${
-- s/^ *//
-- s/ \\*$//
-- s/$/:/
-- p
-- }' "$tmpdepfile" >> "$depfile"
-- else
-- make_dummy_depfile
-- fi
-- rm -f "$tmpdepfile" "$tmpdepfile2"
-- ;;
--
--tru64)
-- # The Tru64 compiler uses -MD to generate dependencies as a side
-- # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-- # dependencies in 'foo.d' instead, so we check for that too.
-- # Subdirectories are respected.
-- set_dir_from "$object"
-- set_base_from "$object"
--
-- if test "$libtool" = yes; then
-- # Libtool generates 2 separate objects for the 2 libraries. These
-- # two compilations output dependencies in $dir.libs/$base.o.d and
-- # in $dir$base.o.d. We have to check for both files, because
-- # one of the two compilations can be disabled. We should prefer
-- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-- # automatically cleaned when .libs/ is deleted, while ignoring
-- # the former would cause a distcleancheck panic.
-- tmpdepfile1=$dir$base.o.d # libtool 1.5
-- tmpdepfile2=$dir.libs/$base.o.d # Likewise.
-- tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
-- "$@" -Wc,-MD
-- else
-- tmpdepfile1=$dir$base.d
-- tmpdepfile2=$dir$base.d
-- tmpdepfile3=$dir$base.d
-- "$@" -MD
-- fi
--
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-- exit $stat
-- fi
--
-- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-- do
-- test -f "$tmpdepfile" && break
-- done
-- # Same post-processing that is required for AIX mode.
-- aix_post_process_depfile
-- ;;
--
--msvc7)
-- if test "$libtool" = yes; then
-- showIncludes=-Wc,-showIncludes
-- else
-- showIncludes=-showIncludes
-- fi
-- "$@" $showIncludes > "$tmpdepfile"
-- stat=$?
-- grep -v '^Note: including file: ' "$tmpdepfile"
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- rm -f "$depfile"
-- echo "$object : \\" > "$depfile"
-- # The first sed program below extracts the file names and escapes
-- # backslashes for cygpath. The second sed program outputs the file
-- # name when reading, but also accumulates all include files in the
-- # hold buffer in order to output them again at the end. This only
-- # works with sed implementations that can handle large buffers.
-- sed < "$tmpdepfile" -n '
--/^Note: including file: *\(.*\)/ {
-- s//\1/
-- s/\\/\\\\/g
-- p
--}' | $cygpath_u | sort -u | sed -n '
--s/ /\\ /g
--s/\(.*\)/'"$tab"'\1 \\/p
--s/.\(.*\) \\/\1:/
--H
--$ {
-- s/.*/'"$tab"'/
-- G
-- p
--}' >> "$depfile"
-- echo >> "$depfile" # make sure the fragment doesn't end with a backslash
-- rm -f "$tmpdepfile"
-- ;;
--
--msvc7msys)
-- # This case exists only to let depend.m4 do its work. It works by
-- # looking at the text of this script. This case will never be run,
-- # since it is checked for above.
-- exit 1
-- ;;
--
--#nosideeffect)
-- # This comment above is used by automake to tell side-effect
-- # dependency tracking mechanisms from slower ones.
--
--dashmstdout)
-- # Important note: in order to support this mode, a compiler *must*
-- # always write the preprocessed file to stdout, regardless of -o.
-- "$@" || exit $?
--
-- # Remove the call to Libtool.
-- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-- shift
-- done
-- shift
-- fi
--
-- # Remove '-o $object'.
-- IFS=" "
-- for arg
-- do
-- case $arg in
-- -o)
-- shift
-- ;;
-- $object)
-- shift
-- ;;
-- *)
-- set fnord "$@" "$arg"
-- shift # fnord
-- shift # $arg
-- ;;
-- esac
-- done
--
-- test -z "$dashmflag" && dashmflag=-M
-- # Require at least two characters before searching for ':'
-- # in the target name. This is to cope with DOS-style filenames:
-- # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
-- "$@" $dashmflag |
-- sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
-- rm -f "$depfile"
-- cat < "$tmpdepfile" > "$depfile"
-- # Some versions of the HPUX 10.20 sed can't process this sed invocation
-- # correctly. Breaking it into two sed invocations is a workaround.
-- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-- | sed -e 's/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--dashXmstdout)
-- # This case only exists to satisfy depend.m4. It is never actually
-- # run, as this mode is specially recognized in the preamble.
-- exit 1
-- ;;
--
--makedepend)
-- "$@" || exit $?
-- # Remove any Libtool call
-- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-- shift
-- done
-- shift
-- fi
-- # X makedepend
-- shift
-- cleared=no eat=no
-- for arg
-- do
-- case $cleared in
-- no)
-- set ""; shift
-- cleared=yes ;;
-- esac
-- if test $eat = yes; then
-- eat=no
-- continue
-- fi
-- case "$arg" in
-- -D*|-I*)
-- set fnord "$@" "$arg"; shift ;;
-- # Strip any option that makedepend may not understand. Remove
-- # the object too, otherwise makedepend will parse it as a source file.
-- -arch)
-- eat=yes ;;
-- -*|$object)
-- ;;
-- *)
-- set fnord "$@" "$arg"; shift ;;
-- esac
-- done
-- obj_suffix=`echo "$object" | sed 's/^.*\././'`
-- touch "$tmpdepfile"
-- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-- rm -f "$depfile"
-- # makedepend may prepend the VPATH from the source file name to the object.
-- # No need to regex-escape $object, excess matching of '.' is harmless.
-- sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-- # Some versions of the HPUX 10.20 sed can't process the last invocation
-- # correctly. Breaking it into two sed invocations is a workaround.
-- sed '1,2d' "$tmpdepfile" \
-- | tr ' ' "$nl" \
-- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-- | sed -e 's/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile" "$tmpdepfile".bak
-- ;;
--
--cpp)
-- # Important note: in order to support this mode, a compiler *must*
-- # always write the preprocessed file to stdout.
-- "$@" || exit $?
--
-- # Remove the call to Libtool.
-- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-- shift
-- done
-- shift
-- fi
--
-- # Remove '-o $object'.
-- IFS=" "
-- for arg
-- do
-- case $arg in
-- -o)
-- shift
-- ;;
-- $object)
-- shift
-- ;;
-- *)
-- set fnord "$@" "$arg"
-- shift # fnord
-- shift # $arg
-- ;;
-- esac
-- done
--
-- "$@" -E \
-- | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-- | sed '$ s: \\$::' > "$tmpdepfile"
-- rm -f "$depfile"
-- echo "$object : \\" > "$depfile"
-- cat < "$tmpdepfile" >> "$depfile"
-- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--msvisualcpp)
-- # Important note: in order to support this mode, a compiler *must*
-- # always write the preprocessed file to stdout.
-- "$@" || exit $?
--
-- # Remove the call to Libtool.
-- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-- shift
-- done
-- shift
-- fi
--
-- IFS=" "
-- for arg
-- do
-- case "$arg" in
-- -o)
-- shift
-- ;;
-- $object)
-- shift
-- ;;
-- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-- set fnord "$@"
-- shift
-- shift
-- ;;
-- *)
-- set fnord "$@" "$arg"
-- shift
-- shift
-- ;;
-- esac
-- done
-- "$@" -E 2>/dev/null |
-- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-- rm -f "$depfile"
-- echo "$object : \\" > "$depfile"
-- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
-- echo "$tab" >> "$depfile"
-- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--msvcmsys)
-- # This case exists only to let depend.m4 do its work. It works by
-- # looking at the text of this script. This case will never be run,
-- # since it is checked for above.
-- exit 1
-- ;;
--
--none)
-- exec "$@"
-- ;;
--
--*)
-- echo "Unknown depmode $depmode" 1>&2
-- exit 1
-- ;;
--esac
--
--exit 0
--
--# Local Variables:
--# mode: shell-script
--# sh-indentation: 2
--# eval: (add-hook 'write-file-hooks 'time-stamp)
--# time-stamp-start: "scriptversion="
--# time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
--# End:
diff --cc build-aux/install-sh
index 377bb86,377bb86..0000000
deleted file mode 100755,100755
--- a/build-aux/install-sh
+++ /dev/null
@@@ -1,527 -1,527 +1,0 @@@
--#!/bin/sh
--# install - install a program, script, or datafile
--
--scriptversion=2011-11-20.07; # UTC
--
--# This originates from X11R5 (mit/util/scripts/install.sh), which was
--# later released in X11R6 (xc/config/util/install.sh) with the
--# following copyright and license.
--#
--# Copyright (C) 1994 X Consortium
--#
--# Permission is hereby granted, free of charge, to any person obtaining a copy
--# of this software and associated documentation files (the "Software"), to
--# deal in the Software without restriction, including without limitation the
--# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
--# sell copies of the Software, and to permit persons to whom the Software is
--# furnished to do so, subject to the following conditions:
--#
--# The above copyright notice and this permission notice shall be included in
--# all copies or substantial portions of the Software.
--#
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
--# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
--# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--#
--# Except as contained in this notice, the name of the X Consortium shall not
--# be used in advertising or otherwise to promote the sale, use or other deal-
--# ings in this Software without prior written authorization from the X Consor-
--# tium.
--#
--#
--# FSF changes to this file are in the public domain.
--#
--# Calling this script install-sh is preferred over install.sh, to prevent
--# 'make' implicit rules from creating a file called install from it
--# when there is no Makefile.
--#
--# This script is compatible with the BSD install script, but was written
--# from scratch.
--
--nl='
--'
--IFS=" "" $nl"
--
--# set DOITPROG to echo to test this script
--
--# Don't use :- since 4.3BSD and earlier shells don't like it.
--doit=${DOITPROG-}
--if test -z "$doit"; then
-- doit_exec=exec
--else
-- doit_exec=$doit
--fi
--
--# Put in absolute file names if you don't have them in your path;
--# or use environment vars.
--
--chgrpprog=${CHGRPPROG-chgrp}
--chmodprog=${CHMODPROG-chmod}
--chownprog=${CHOWNPROG-chown}
--cmpprog=${CMPPROG-cmp}
--cpprog=${CPPROG-cp}
--mkdirprog=${MKDIRPROG-mkdir}
--mvprog=${MVPROG-mv}
--rmprog=${RMPROG-rm}
--stripprog=${STRIPPROG-strip}
--
--posix_glob='?'
--initialize_posix_glob='
-- test "$posix_glob" != "?" || {
-- if (set -f) 2>/dev/null; then
-- posix_glob=
-- else
-- posix_glob=:
-- fi
-- }
--'
--
--posix_mkdir=
--
--# Desired mode of installed file.
--mode=0755
--
--chgrpcmd=
--chmodcmd=$chmodprog
--chowncmd=
--mvcmd=$mvprog
--rmcmd="$rmprog -f"
--stripcmd=
--
--src=
--dst=
--dir_arg=
--dst_arg=
--
--copy_on_change=false
--no_target_directory=
--
--usage="\
--Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-- or: $0 [OPTION]... SRCFILES... DIRECTORY
-- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-- or: $0 [OPTION]... -d DIRECTORIES...
--
--In the 1st form, copy SRCFILE to DSTFILE.
--In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
--In the 4th, create DIRECTORIES.
--
--Options:
-- --help display this help and exit.
-- --version display version info and exit.
--
-- -c (ignored)
-- -C install only if different (preserve the last data modification time)
-- -d create directories instead of installing files.
-- -g GROUP $chgrpprog installed files to GROUP.
-- -m MODE $chmodprog installed files to MODE.
-- -o USER $chownprog installed files to USER.
-- -s $stripprog installed files.
-- -t DIRECTORY install into DIRECTORY.
-- -T report an error if DSTFILE is a directory.
--
--Environment variables override the default commands:
-- CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-- RMPROG STRIPPROG
--"
--
--while test $# -ne 0; do
-- case $1 in
-- -c) ;;
--
-- -C) copy_on_change=true;;
--
-- -d) dir_arg=true;;
--
-- -g) chgrpcmd="$chgrpprog $2"
-- shift;;
--
-- --help) echo "$usage"; exit $?;;
--
-- -m) mode=$2
-- case $mode in
-- *' '* | *' '* | *'
--'* | *'*'* | *'?'* | *'['*)
-- echo "$0: invalid mode: $mode" >&2
-- exit 1;;
-- esac
-- shift;;
--
-- -o) chowncmd="$chownprog $2"
-- shift;;
--
-- -s) stripcmd=$stripprog;;
--
-- -t) dst_arg=$2
-- # Protect names problematic for 'test' and other utilities.
-- case $dst_arg in
-- -* | [=\(\)!]) dst_arg=./$dst_arg;;
-- esac
-- shift;;
--
-- -T) no_target_directory=true;;
--
-- --version) echo "$0 $scriptversion"; exit $?;;
--
-- --) shift
-- break;;
--
-- -*) echo "$0: invalid option: $1" >&2
-- exit 1;;
--
-- *) break;;
-- esac
-- shift
--done
--
--if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-- # When -d is used, all remaining arguments are directories to create.
-- # When -t is used, the destination is already specified.
-- # Otherwise, the last argument is the destination. Remove it from $@.
-- for arg
-- do
-- if test -n "$dst_arg"; then
-- # $@ is not empty: it contains at least $arg.
-- set fnord "$@" "$dst_arg"
-- shift # fnord
-- fi
-- shift # arg
-- dst_arg=$arg
-- # Protect names problematic for 'test' and other utilities.
-- case $dst_arg in
-- -* | [=\(\)!]) dst_arg=./$dst_arg;;
-- esac
-- done
--fi
--
--if test $# -eq 0; then
-- if test -z "$dir_arg"; then
-- echo "$0: no input file specified." >&2
-- exit 1
-- fi
-- # It's OK to call 'install-sh -d' without argument.
-- # This can happen when creating conditional directories.
-- exit 0
--fi
--
--if test -z "$dir_arg"; then
-- do_exit='(exit $ret); exit $ret'
-- trap "ret=129; $do_exit" 1
-- trap "ret=130; $do_exit" 2
-- trap "ret=141; $do_exit" 13
-- trap "ret=143; $do_exit" 15
--
-- # Set umask so as not to create temps with too-generous modes.
-- # However, 'strip' requires both read and write access to temps.
-- case $mode in
-- # Optimize common cases.
-- *644) cp_umask=133;;
-- *755) cp_umask=22;;
--
-- *[0-7])
-- if test -z "$stripcmd"; then
-- u_plus_rw=
-- else
-- u_plus_rw='% 200'
-- fi
-- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-- *)
-- if test -z "$stripcmd"; then
-- u_plus_rw=
-- else
-- u_plus_rw=,u+rw
-- fi
-- cp_umask=$mode$u_plus_rw;;
-- esac
--fi
--
--for src
--do
-- # Protect names problematic for 'test' and other utilities.
-- case $src in
-- -* | [=\(\)!]) src=./$src;;
-- esac
--
-- if test -n "$dir_arg"; then
-- dst=$src
-- dstdir=$dst
-- test -d "$dstdir"
-- dstdir_status=$?
-- else
--
-- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-- # might cause directories to be created, which would be especially bad
-- # if $src (and thus $dsttmp) contains '*'.
-- if test ! -f "$src" && test ! -d "$src"; then
-- echo "$0: $src does not exist." >&2
-- exit 1
-- fi
--
-- if test -z "$dst_arg"; then
-- echo "$0: no destination specified." >&2
-- exit 1
-- fi
-- dst=$dst_arg
--
-- # If destination is a directory, append the input filename; won't work
-- # if double slashes aren't ignored.
-- if test -d "$dst"; then
-- if test -n "$no_target_directory"; then
-- echo "$0: $dst_arg: Is a directory" >&2
-- exit 1
-- fi
-- dstdir=$dst
-- dst=$dstdir/`basename "$src"`
-- dstdir_status=0
-- else
-- # Prefer dirname, but fall back on a substitute if dirname fails.
-- dstdir=`
-- (dirname "$dst") 2>/dev/null ||
-- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$dst" : 'X\(//\)[^/]' \| \
-- X"$dst" : 'X\(//\)$' \| \
-- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-- echo X"$dst" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)[^/].*/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\).*/{
-- s//\1/
-- q
-- }
-- s/.*/./; q'
-- `
--
-- test -d "$dstdir"
-- dstdir_status=$?
-- fi
-- fi
--
-- obsolete_mkdir_used=false
--
-- if test $dstdir_status != 0; then
-- case $posix_mkdir in
-- '')
-- # Create intermediate dirs using mode 755 as modified by the umask.
-- # This is like FreeBSD 'install' as of 1997-10-28.
-- umask=`umask`
-- case $stripcmd.$umask in
-- # Optimize common cases.
-- *[2367][2367]) mkdir_umask=$umask;;
-- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
--
-- *[0-7])
-- mkdir_umask=`expr $umask + 22 \
-- - $umask % 100 % 40 + $umask % 20 \
-- - $umask % 10 % 4 + $umask % 2
-- `;;
-- *) mkdir_umask=$umask,go-w;;
-- esac
--
-- # With -d, create the new directory with the user-specified mode.
-- # Otherwise, rely on $mkdir_umask.
-- if test -n "$dir_arg"; then
-- mkdir_mode=-m$mode
-- else
-- mkdir_mode=
-- fi
--
-- posix_mkdir=false
-- case $umask in
-- *[123567][0-7][0-7])
-- # POSIX mkdir -p sets u+wx bits regardless of umask, which
-- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-- ;;
-- *)
-- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
--
-- if (umask $mkdir_umask &&
-- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-- then
-- if test -z "$dir_arg" || {
-- # Check for POSIX incompatibilities with -m.
-- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-- # other-writable bit of parent directory when it shouldn't.
-- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-- ls_ld_tmpdir=`ls -ld "$tmpdir"`
-- case $ls_ld_tmpdir in
-- d????-?r-*) different_mode=700;;
-- d????-?--*) different_mode=755;;
-- *) false;;
-- esac &&
-- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-- }
-- }
-- then posix_mkdir=:
-- fi
-- rmdir "$tmpdir/d" "$tmpdir"
-- else
-- # Remove any dirs left behind by ancient mkdir implementations.
-- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-- fi
-- trap '' 0;;
-- esac;;
-- esac
--
-- if
-- $posix_mkdir && (
-- umask $mkdir_umask &&
-- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-- )
-- then :
-- else
--
-- # The umask is ridiculous, or mkdir does not conform to POSIX,
-- # or it failed possibly due to a race condition. Create the
-- # directory the slow way, step by step, checking for races as we go.
--
-- case $dstdir in
-- /*) prefix='/';;
-- [-=\(\)!]*) prefix='./';;
-- *) prefix='';;
-- esac
--
-- eval "$initialize_posix_glob"
--
-- oIFS=$IFS
-- IFS=/
-- $posix_glob set -f
-- set fnord $dstdir
-- shift
-- $posix_glob set +f
-- IFS=$oIFS
--
-- prefixes=
--
-- for d
-- do
-- test X"$d" = X && continue
--
-- prefix=$prefix$d
-- if test -d "$prefix"; then
-- prefixes=
-- else
-- if $posix_mkdir; then
-- (umask=$mkdir_umask &&
-- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-- # Don't fail if two instances are running concurrently.
-- test -d "$prefix" || exit 1
-- else
-- case $prefix in
-- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) qprefix=$prefix;;
-- esac
-- prefixes="$prefixes '$qprefix'"
-- fi
-- fi
-- prefix=$prefix/
-- done
--
-- if test -n "$prefixes"; then
-- # Don't fail if two instances are running concurrently.
-- (umask $mkdir_umask &&
-- eval "\$doit_exec \$mkdirprog $prefixes") ||
-- test -d "$dstdir" || exit 1
-- obsolete_mkdir_used=true
-- fi
-- fi
-- fi
--
-- if test -n "$dir_arg"; then
-- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-- else
--
-- # Make a couple of temp file names in the proper directory.
-- dsttmp=$dstdir/_inst.$$_
-- rmtmp=$dstdir/_rm.$$_
--
-- # Trap to clean up those temp files at exit.
-- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
--
-- # Copy the file name to the temp name.
-- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
--
-- # and set any options; do chmod last to preserve setuid bits.
-- #
-- # If any of these fail, we abort the whole thing. If we want to
-- # ignore errors from any of these, just make sure not to ignore
-- # errors from the above "$doit $cpprog $src $dsttmp" command.
-- #
-- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-- { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-- { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
--
-- # If -C, don't bother to copy if it wouldn't change the file.
-- if $copy_on_change &&
-- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
-- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
--
-- eval "$initialize_posix_glob" &&
-- $posix_glob set -f &&
-- set X $old && old=:$2:$4:$5:$6 &&
-- set X $new && new=:$2:$4:$5:$6 &&
-- $posix_glob set +f &&
--
-- test "$old" = "$new" &&
-- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-- then
-- rm -f "$dsttmp"
-- else
-- # Rename the file to the real destination.
-- $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
--
-- # The rename failed, perhaps because mv can't rename something else
-- # to itself, or perhaps because mv is so ancient that it does not
-- # support -f.
-- {
-- # Now remove or move aside any old file at destination location.
-- # We try this two ways since rm can't unlink itself on some
-- # systems and the destination file might be busy for other
-- # reasons. In this case, the final cleanup might fail but the new
-- # file should still install successfully.
-- {
-- test ! -f "$dst" ||
-- $doit $rmcmd -f "$dst" 2>/dev/null ||
-- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-- } ||
-- { echo "$0: cannot unlink or rename $dst" >&2
-- (exit 1); exit 1
-- }
-- } &&
--
-- # Now rename the file to the real destination.
-- $doit $mvcmd "$dsttmp" "$dst"
-- }
-- fi || exit 1
--
-- trap '' 0
-- fi
--done
--
--# Local variables:
--# eval: (add-hook 'write-file-hooks 'time-stamp)
--# time-stamp-start: "scriptversion="
--# time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
--# End:
diff --cc build-aux/missing
index db98974,db98974..0000000
deleted file mode 100755,100755
--- a/build-aux/missing
+++ /dev/null
@@@ -1,215 -1,215 +1,0 @@@
--#! /bin/sh
--# Common wrapper for a few potentially missing GNU programs.
--
--scriptversion=2013-10-28.13; # UTC
--
--# Copyright (C) 1996-2013 Free Software Foundation, Inc.
--# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
--
--# 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 2, 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/>.
--
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--if test $# -eq 0; then
-- echo 1>&2 "Try '$0 --help' for more information"
-- exit 1
--fi
--
--case $1 in
--
-- --is-lightweight)
-- # Used by our autoconf macros to check whether the available missing
-- # script is modern enough.
-- exit 0
-- ;;
--
-- --run)
-- # Back-compat with the calling convention used by older automake.
-- shift
-- ;;
--
-- -h|--h|--he|--hel|--help)
-- echo "\
--$0 [OPTION]... PROGRAM [ARGUMENT]...
--
--Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
--to PROGRAM being missing or too old.
--
--Options:
-- -h, --help display this help and exit
-- -v, --version output version information and exit
--
--Supported PROGRAM values:
-- aclocal autoconf autoheader autom4te automake makeinfo
-- bison yacc flex lex help2man
--
--Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
--'g' are ignored when checking the name.
--
--Send bug reports to <bug-automake at gnu.org>."
-- exit $?
-- ;;
--
-- -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-- echo "missing $scriptversion (GNU Automake)"
-- exit $?
-- ;;
--
-- -*)
-- echo 1>&2 "$0: unknown '$1' option"
-- echo 1>&2 "Try '$0 --help' for more information"
-- exit 1
-- ;;
--
--esac
--
--# Run the given program, remember its exit status.
--"$@"; st=$?
--
--# If it succeeded, we are done.
--test $st -eq 0 && exit 0
--
--# Also exit now if we it failed (or wasn't found), and '--version' was
--# passed; such an option is passed most likely to detect whether the
--# program is present and works.
--case $2 in --version|--help) exit $st;; esac
--
--# Exit code 63 means version mismatch. This often happens when the user
--# tries to use an ancient version of a tool on a file that requires a
--# minimum version.
--if test $st -eq 63; then
-- msg="probably too old"
--elif test $st -eq 127; then
-- # Program was missing.
-- msg="missing on your system"
--else
-- # Program was found and executed, but failed. Give up.
-- exit $st
--fi
--
--perl_URL=http://www.perl.org/
--flex_URL=http://flex.sourceforge.net/
--gnu_software_URL=http://www.gnu.org/software
--
--program_details ()
--{
-- case $1 in
-- aclocal|automake)
-- echo "The '$1' program is part of the GNU Automake package:"
-- echo "<$gnu_software_URL/automake>"
-- echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-- echo "<$gnu_software_URL/autoconf>"
-- echo "<$gnu_software_URL/m4/>"
-- echo "<$perl_URL>"
-- ;;
-- autoconf|autom4te|autoheader)
-- echo "The '$1' program is part of the GNU Autoconf package:"
-- echo "<$gnu_software_URL/autoconf/>"
-- echo "It also requires GNU m4 and Perl in order to run:"
-- echo "<$gnu_software_URL/m4/>"
-- echo "<$perl_URL>"
-- ;;
-- esac
--}
--
--give_advice ()
--{
-- # Normalize program name to check for.
-- normalized_program=`echo "$1" | sed '
-- s/^gnu-//; t
-- s/^gnu//; t
-- s/^g//; t'`
--
-- printf '%s\n' "'$1' is $msg."
--
-- configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-- case $normalized_program in
-- autoconf*)
-- echo "You should only need it if you modified 'configure.ac',"
-- echo "or m4 files included by it."
-- program_details 'autoconf'
-- ;;
-- autoheader*)
-- echo "You should only need it if you modified 'acconfig.h' or"
-- echo "$configure_deps."
-- program_details 'autoheader'
-- ;;
-- automake*)
-- echo "You should only need it if you modified 'Makefile.am' or"
-- echo "$configure_deps."
-- program_details 'automake'
-- ;;
-- aclocal*)
-- echo "You should only need it if you modified 'acinclude.m4' or"
-- echo "$configure_deps."
-- program_details 'aclocal'
-- ;;
-- autom4te*)
-- echo "You might have modified some maintainer files that require"
-- echo "the 'autom4te' program to be rebuilt."
-- program_details 'autom4te'
-- ;;
-- bison*|yacc*)
-- echo "You should only need it if you modified a '.y' file."
-- echo "You may want to install the GNU Bison package:"
-- echo "<$gnu_software_URL/bison/>"
-- ;;
-- lex*|flex*)
-- echo "You should only need it if you modified a '.l' file."
-- echo "You may want to install the Fast Lexical Analyzer package:"
-- echo "<$flex_URL>"
-- ;;
-- help2man*)
-- echo "You should only need it if you modified a dependency" \
-- "of a man page."
-- echo "You may want to install the GNU Help2man package:"
-- echo "<$gnu_software_URL/help2man/>"
-- ;;
-- makeinfo*)
-- echo "You should only need it if you modified a '.texi' file, or"
-- echo "any other file indirectly affecting the aspect of the manual."
-- echo "You might want to install the Texinfo package:"
-- echo "<$gnu_software_URL/texinfo/>"
-- echo "The spurious makeinfo call might also be the consequence of"
-- echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-- echo "want to install GNU make:"
-- echo "<$gnu_software_URL/make/>"
-- ;;
-- *)
-- echo "You might have modified some files without having the proper"
-- echo "tools for further handling them. Check the 'README' file, it"
-- echo "often tells you about the needed prerequisites for installing"
-- echo "this package. You may also peek at any GNU archive site, in"
-- echo "case some other package contains this missing '$1' program."
-- ;;
-- esac
--}
--
--give_advice "$1" | sed -e '1s/^/WARNING: /' \
-- -e '2,$s/^/ /' >&2
--
--# Propagate the correct exit status (expected to be 127 for a program
--# not found, 63 for a program that failed due to version mismatch).
--exit $st
--
--# Local variables:
--# eval: (add-hook 'write-file-hooks 'time-stamp)
--# time-stamp-start: "scriptversion="
--# time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
--# End:
diff --cc build-aux/mkinstalldirs
index ef7e16f,ef7e16f..0000000
deleted file mode 100755,100755
--- a/build-aux/mkinstalldirs
+++ /dev/null
@@@ -1,161 -1,161 +1,0 @@@
--#! /bin/sh
--# mkinstalldirs --- make directory hierarchy
--
--scriptversion=2006-05-11.19
--
--# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
--# Created: 1993-05-16
--# Public domain.
--#
--# This file is maintained in Automake, please report
--# bugs to <bug-automake at gnu.org> or send patches to
--# <automake-patches at gnu.org>.
--
--nl='
--'
--IFS=" "" $nl"
--errstatus=0
--dirmode=
--
--usage="\
--Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
--
--Create each directory DIR (with mode MODE, if specified), including all
--leading file name components.
--
--Report bugs to <bug-automake at gnu.org>."
--
--# process command line arguments
--while test $# -gt 0 ; do
-- case $1 in
-- -h | --help | --h*) # -h for help
-- echo "$usage"
-- exit $?
-- ;;
-- -m) # -m PERM arg
-- shift
-- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-- dirmode=$1
-- shift
-- ;;
-- --version)
-- echo "$0 $scriptversion"
-- exit $?
-- ;;
-- --) # stop option processing
-- shift
-- break
-- ;;
-- -*) # unknown option
-- echo "$usage" 1>&2
-- exit 1
-- ;;
-- *) # first non-opt arg
-- break
-- ;;
-- esac
--done
--
--for file
--do
-- if test -d "$file"; then
-- shift
-- else
-- break
-- fi
--done
--
--case $# in
-- 0) exit 0 ;;
--esac
--
--# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
--# mkdir -p a/c at the same time, both will detect that a is missing,
--# one will create a, then the other will try to create a and die with
--# a "File exists" error. This is a problem when calling mkinstalldirs
--# from a parallel make. We use --version in the probe to restrict
--# ourselves to GNU mkdir, which is thread-safe.
--case $dirmode in
-- '')
-- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-- echo "mkdir -p -- $*"
-- exec mkdir -p -- "$@"
-- else
-- # On NextStep and OpenStep, the `mkdir' command does not
-- # recognize any option. It will interpret all options as
-- # directories to create, and then abort because `.' already
-- # exists.
-- test -d ./-p && rmdir ./-p
-- test -d ./--version && rmdir ./--version
-- fi
-- ;;
-- *)
-- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-- test ! -d ./--version; then
-- echo "mkdir -m $dirmode -p -- $*"
-- exec mkdir -m "$dirmode" -p -- "$@"
-- else
-- # Clean up after NextStep and OpenStep mkdir.
-- for d in ./-m ./-p ./--version "./$dirmode";
-- do
-- test -d $d && rmdir $d
-- done
-- fi
-- ;;
--esac
--
--for file
--do
-- case $file in
-- /*) pathcomp=/ ;;
-- *) pathcomp= ;;
-- esac
-- oIFS=$IFS
-- IFS=/
-- set fnord $file
-- shift
-- IFS=$oIFS
--
-- for d
-- do
-- test "x$d" = x && continue
--
-- pathcomp=$pathcomp$d
-- case $pathcomp in
-- -*) pathcomp=./$pathcomp ;;
-- esac
--
-- if test ! -d "$pathcomp"; then
-- echo "mkdir $pathcomp"
--
-- mkdir "$pathcomp" || lasterr=$?
--
-- if test ! -d "$pathcomp"; then
-- errstatus=$lasterr
-- else
-- if test ! -z "$dirmode"; then
-- echo "chmod $dirmode $pathcomp"
-- lasterr=
-- chmod "$dirmode" "$pathcomp" || lasterr=$?
--
-- if test ! -z "$lasterr"; then
-- errstatus=$lasterr
-- fi
-- fi
-- fi
-- fi
--
-- pathcomp=$pathcomp/
-- done
--done
--
--exit $errstatus
--
--# Local Variables:
--# mode: shell-script
--# sh-indentation: 2
--# eval: (add-hook 'write-file-hooks 'time-stamp)
--# time-stamp-start: "scriptversion="
--# time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
--# End:
diff --cc build-aux/texinfo.tex
index a181898,a181898..0000000
deleted file mode 100644,100644
--- a/build-aux/texinfo.tex
+++ /dev/null
@@@ -1,8638 -1,8638 +1,0 @@@
--% texinfo.tex -- TeX macros to handle Texinfo files.
--%
--% Load plain if necessary, i.e., if running under initex.
--\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
--%
--\def\texinfoversion{2007-05-03.09}
--%
--% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
--% 2007 Free Software Foundation, Inc.
--%
--% This texinfo.tex file 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, or (at
--% your option) any later version.
--%
--% This texinfo.tex file is distributed in the hope that it will be
--% useful, but WITHOUT ANY WARRANTY; without even the implied warranty
--% of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--% General Public License for more details.
--%
--% You should have received a copy of the GNU General Public License
--% along with this texinfo.tex file; see the file COPYING. If not,
--% see <http://www.gnu.org/licenses/>.
--%
--% As a special exception, when this file is read by TeX when processing
--% a Texinfo source document, you may use the result without
--% restriction. (This has been our intent since Texinfo was invented.)
--%
--% Please try the latest version of texinfo.tex before submitting bug
--% reports; you can get the latest version from:
--% http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
--% ftp://tug.org/tex/texinfo.tex
--% (and all CTAN mirrors, see http://www.ctan.org).
--% The texinfo.tex in any given distribution could well be out
--% of date, so if that's what you're using, please check.
--%
--% Send bug reports to bug-texinfo at gnu.org. Please include including a
--% complete document in each bug report with which we can reproduce the
--% problem. Patches are, of course, greatly appreciated.
--%
--% To process a Texinfo manual with TeX, it's most reliable to use the
--% texi2dvi shell script that comes with the distribution. For a simple
--% manual foo.texi, however, you can get away with this:
--% tex foo.texi
--% texindex foo.??
--% tex foo.texi
--% tex foo.texi
--% dvips foo.dvi -o # or whatever; this makes foo.ps.
--% The extra TeX runs get the cross-reference information correct.
--% Sometimes one run after texindex suffices, and sometimes you need more
--% than two; texi2dvi does it as many times as necessary.
--%
--% It is possible to adapt texinfo.tex for other languages, to some
--% extent. You can get the existing language-specific files from the
--% full Texinfo distribution.
--%
--% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
--
--
--\message{Loading texinfo [version \texinfoversion]:}
--
--% If in a .fmt file, print the version number
--% and turn on active characters that we couldn't do earlier because
--% they might have appeared in the input file name.
--\everyjob{\message{[Texinfo version \texinfoversion]}%
-- \catcode`+=\active \catcode`\_=\active}
--
--
--\chardef\other=12
--
--% We never want plain's \outer definition of \+ in Texinfo.
--% For @tex, we can use \tabalign.
--\let\+ = \relax
--
--% Save some plain tex macros whose names we will redefine.
--\let\ptexb=\b
--\let\ptexbullet=\bullet
--\let\ptexc=\c
--\let\ptexcomma=\,
--\let\ptexdot=\.
--\let\ptexdots=\dots
--\let\ptexend=\end
--\let\ptexequiv=\equiv
--\let\ptexexclam=\!
--\let\ptexfootnote=\footnote
--\let\ptexgtr=>
--\let\ptexhat=^
--\let\ptexi=\i
--\let\ptexindent=\indent
--\let\ptexinsert=\insert
--\let\ptexlbrace=\{
--\let\ptexless=<
--\let\ptexnewwrite\newwrite
--\let\ptexnoindent=\noindent
--\let\ptexplus=+
--\let\ptexrbrace=\}
--\let\ptexslash=\/
--\let\ptexstar=\*
--\let\ptext=\t
--
--% If this character appears in an error message or help string, it
--% starts a new line in the output.
--\newlinechar = `^^J
--
--% Use TeX 3.0's \inputlineno to get the line number, for better error
--% messages, but if we're using an old version of TeX, don't do anything.
--%
--\ifx\inputlineno\thisisundefined
-- \let\linenumber = \empty % Pre-3.0.
--\else
-- \def\linenumber{l.\the\inputlineno:\space}
--\fi
--
--% Set up fixed words for English if not already set.
--\ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi
--\ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi
--\ifx\putwordfile\undefined \gdef\putwordfile{file}\fi
--\ifx\putwordin\undefined \gdef\putwordin{in}\fi
--\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
--\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
--\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi
--\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
--\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi
--\ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi
--\ifx\putwordof\undefined \gdef\putwordof{of}\fi
--\ifx\putwordon\undefined \gdef\putwordon{on}\fi
--\ifx\putwordpage\undefined \gdef\putwordpage{page}\fi
--\ifx\putwordsection\undefined \gdef\putwordsection{section}\fi
--\ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi
--\ifx\putwordsee\undefined \gdef\putwordsee{see}\fi
--\ifx\putwordSee\undefined \gdef\putwordSee{See}\fi
--\ifx\putwordShortTOC\undefined \gdef\putwordShortTOC{Short Contents}\fi
--\ifx\putwordTOC\undefined \gdef\putwordTOC{Table of Contents}\fi
--%
--\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi
--\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi
--\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi
--\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi
--\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi
--\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi
--\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi
--\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi
--\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi
--\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi
--\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi
--\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi
--%
--\ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi
--\ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi
--\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi
--\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
--\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi
--
--% Since the category of space is not known, we have to be careful.
--\chardef\spacecat = 10
--\def\spaceisspace{\catcode`\ =\spacecat}
--
--% sometimes characters are active, so we need control sequences.
--\chardef\colonChar = `\:
--\chardef\commaChar = `\,
--\chardef\dashChar = `\-
--\chardef\dotChar = `\.
--\chardef\exclamChar= `\!
--\chardef\lquoteChar= `\`
--\chardef\questChar = `\?
--\chardef\rquoteChar= `\'
--\chardef\semiChar = `\;
--\chardef\underChar = `\_
--
--% Ignore a token.
--%
--\def\gobble#1{}
--
--% The following is used inside several \edef's.
--\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname}
--
--% Hyphenation fixes.
--\hyphenation{
-- Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script
-- ap-pen-dix bit-map bit-maps
-- data-base data-bases eshell fall-ing half-way long-est man-u-script
-- man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
-- par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
-- spell-ing spell-ings
-- stand-alone strong-est time-stamp time-stamps which-ever white-space
-- wide-spread wrap-around
--}
--
--% Margin to add to right of even pages, to left of odd pages.
--\newdimen\bindingoffset
--\newdimen\normaloffset
--\newdimen\pagewidth \newdimen\pageheight
--
--% For a final copy, take out the rectangles
--% that mark overfull boxes (in case you have decided
--% that the text looks ok even though it passes the margin).
--%
--\def\finalout{\overfullrule=0pt}
--
--% @| inserts a changebar to the left of the current line. It should
--% surround any changed text. This approach does *not* work if the
--% change spans more than two lines of output. To handle that, we would
--% have adopt a much more difficult approach (putting marks into the main
--% vertical list for the beginning and end of each change).
--%
--\def\|{%
-- % \vadjust can only be used in horizontal mode.
-- \leavevmode
-- %
-- % Append this vertical mode material after the current line in the output.
-- \vadjust{%
-- % We want to insert a rule with the height and depth of the current
-- % leading; that is exactly what \strutbox is supposed to record.
-- \vskip-\baselineskip
-- %
-- % \vadjust-items are inserted at the left edge of the type. So
-- % the \llap here moves out into the left-hand margin.
-- \llap{%
-- %
-- % For a thicker or thinner bar, change the `1pt'.
-- \vrule height\baselineskip width1pt
-- %
-- % This is the space between the bar and the text.
-- \hskip 12pt
-- }%
-- }%
--}
--
--% Sometimes it is convenient to have everything in the transcript file
--% and nothing on the terminal. We don't just call \tracingall here,
--% since that produces some useless output on the terminal. We also make
--% some effort to order the tracing commands to reduce output in the log
--% file; cf. trace.sty in LaTeX.
--%
--\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
--\def\loggingall{%
-- \tracingstats2
-- \tracingpages1
-- \tracinglostchars2 % 2 gives us more in etex
-- \tracingparagraphs1
-- \tracingoutput1
-- \tracingmacros2
-- \tracingrestores1
-- \showboxbreadth\maxdimen \showboxdepth\maxdimen
-- \ifx\eTeXversion\undefined\else % etex gives us more logging
-- \tracingscantokens1
-- \tracingifs1
-- \tracinggroups1
-- \tracingnesting2
-- \tracingassigns1
-- \fi
-- \tracingcommands3 % 3 gives us more in etex
-- \errorcontextlines16
--}%
--
--% add check for \lastpenalty to plain's definitions. If the last thing
--% we did was a \nobreak, we don't want to insert more space.
--%
--\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount
-- \removelastskip\penalty-50\smallskip\fi\fi}
--\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount
-- \removelastskip\penalty-100\medskip\fi\fi}
--\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
-- \removelastskip\penalty-200\bigskip\fi\fi}
--
--% For @cropmarks command.
--% Do @cropmarks to get crop marks.
--%
--\newif\ifcropmarks
--\let\cropmarks = \cropmarkstrue
--%
--% Dimensions to add cropmarks at corners.
--% Added by P. A. MacKay, 12 Nov. 1986
--%
--\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
--\newdimen\cornerlong \cornerlong=1pc
--\newdimen\cornerthick \cornerthick=.3pt
--\newdimen\topandbottommargin \topandbottommargin=.75in
--
--% Main output routine.
--\chardef\PAGE = 255
--\output = {\onepageout{\pagecontents\PAGE}}
--
--\newbox\headlinebox
--\newbox\footlinebox
--
--% \onepageout takes a vbox as an argument. Note that \pagecontents
--% does insertions, but you have to call it yourself.
--\def\onepageout#1{%
-- \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
-- %
-- \ifodd\pageno \advance\hoffset by \bindingoffset
-- \else \advance\hoffset by -\bindingoffset\fi
-- %
-- % Do this outside of the \shipout so @code etc. will be expanded in
-- % the headline as they should be, not taken literally (outputting ''code).
-- \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
-- \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
-- %
-- {%
-- % Have to do this stuff outside the \shipout because we want it to
-- % take effect in \write's, yet the group defined by the \vbox ends
-- % before the \shipout runs.
-- %
-- \indexdummies % don't expand commands in the output.
-- \normalturnoffactive % \ in index entries must not stay \, e.g., if
-- % the page break happens to be in the middle of an example.
-- % We don't want .vr (or whatever) entries like this:
-- % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
-- % "\acronym" won't work when it's read back in;
-- % it needs to be
-- % {\code {{\tt \backslashcurfont }acronym}
-- \shipout\vbox{%
-- % Do this early so pdf references go to the beginning of the page.
-- \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
-- %
-- \ifcropmarks \vbox to \outervsize\bgroup
-- \hsize = \outerhsize
-- \vskip-\topandbottommargin
-- \vtop to0pt{%
-- \line{\ewtop\hfil\ewtop}%
-- \nointerlineskip
-- \line{%
-- \vbox{\moveleft\cornerthick\nstop}%
-- \hfill
-- \vbox{\moveright\cornerthick\nstop}%
-- }%
-- \vss}%
-- \vskip\topandbottommargin
-- \line\bgroup
-- \hfil % center the page within the outer (page) hsize.
-- \ifodd\pageno\hskip\bindingoffset\fi
-- \vbox\bgroup
-- \fi
-- %
-- \unvbox\headlinebox
-- \pagebody{#1}%
-- \ifdim\ht\footlinebox > 0pt
-- % Only leave this space if the footline is nonempty.
-- % (We lessened \vsize for it in \oddfootingyyy.)
-- % The \baselineskip=24pt in plain's \makefootline has no effect.
-- \vskip 24pt
-- \unvbox\footlinebox
-- \fi
-- %
-- \ifcropmarks
-- \egroup % end of \vbox\bgroup
-- \hfil\egroup % end of (centering) \line\bgroup
-- \vskip\topandbottommargin plus1fill minus1fill
-- \boxmaxdepth = \cornerthick
-- \vbox to0pt{\vss
-- \line{%
-- \vbox{\moveleft\cornerthick\nsbot}%
-- \hfill
-- \vbox{\moveright\cornerthick\nsbot}%
-- }%
-- \nointerlineskip
-- \line{\ewbot\hfil\ewbot}%
-- }%
-- \egroup % \vbox from first cropmarks clause
-- \fi
-- }% end of \shipout\vbox
-- }% end of group with \indexdummies
-- \advancepageno
-- \ifnum\outputpenalty>-20000 \else\dosupereject\fi
--}
--
--\newinsert\margin \dimen\margin=\maxdimen
--
--\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
--{\catcode`\@ =11
--\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
--% marginal hacks, juha at viisa.uucp (Juha Takala)
--\ifvoid\margin\else % marginal info is present
-- \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
--\dimen@=\dp#1 \unvbox#1
--\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
--\ifr at ggedbottom \kern-\dimen@ \vfil \fi}
--}
--
--% Here are the rules for the cropmarks. Note that they are
--% offset so that the space between them is truly \outerhsize or \outervsize
--% (P. A. MacKay, 12 November, 1986)
--%
--\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong}
--\def\nstop{\vbox
-- {\hrule height\cornerthick depth\cornerlong width\cornerthick}}
--\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong}
--\def\nsbot{\vbox
-- {\hrule height\cornerlong depth\cornerthick width\cornerthick}}
--
--% Parse an argument, then pass it to #1. The argument is the rest of
--% the input line (except we remove a trailing comment). #1 should be a
--% macro which expects an ordinary undelimited TeX argument.
--%
--\def\parsearg{\parseargusing{}}
--\def\parseargusing#1#2{%
-- \def\argtorun{#2}%
-- \begingroup
-- \obeylines
-- \spaceisspace
-- #1%
-- \parseargline\empty% Insert the \empty token, see \finishparsearg below.
--}
--
--{\obeylines %
-- \gdef\parseargline#1^^M{%
-- \endgroup % End of the group started in \parsearg.
-- \argremovecomment #1\comment\ArgTerm%
-- }%
--}
--
--% First remove any @comment, then any @c comment.
--\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
--\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
--
--% Each occurence of `\^^M' or `<space>\^^M' is replaced by a single space.
--%
--% \argremovec might leave us with trailing space, e.g.,
--% @end itemize @c foo
--% This space token undergoes the same procedure and is eventually removed
--% by \finishparsearg.
--%
--\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M}
--\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M}
--\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
-- \def\temp{#3}%
-- \ifx\temp\empty
-- % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
-- \let\temp\finishparsearg
-- \else
-- \let\temp\argcheckspaces
-- \fi
-- % Put the space token in:
-- \temp#1 #3\ArgTerm
--}
--
--% If a _delimited_ argument is enclosed in braces, they get stripped; so
--% to get _exactly_ the rest of the line, we had to prevent such situation.
--% We prepended an \empty token at the very beginning and we expand it now,
--% just before passing the control to \argtorun.
--% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
--% either the null string, or it ends with \^^M---thus there is no danger
--% that a pair of braces would be stripped.
--%
--% But first, we have to remove the trailing space token.
--%
--\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
--
--% \parseargdef\foo{...}
--% is roughly equivalent to
--% \def\foo{\parsearg\Xfoo}
--% \def\Xfoo#1{...}
--%
--% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my
--% favourite TeX trick. --kasal, 16nov03
--
--\def\parseargdef#1{%
-- \expandafter \doparseargdef \csname\string#1\endcsname #1%
--}
--\def\doparseargdef#1#2{%
-- \def#2{\parsearg#1}%
-- \def#1##1%
--}
--
--% Several utility definitions with active space:
--{
-- \obeyspaces
-- \gdef\obeyedspace{ }
--
-- % Make each space character in the input produce a normal interword
-- % space in the output. Don't allow a line break at this space, as this
-- % is used only in environments like @example, where each line of input
-- % should produce a line of output anyway.
-- %
-- \gdef\sepspaces{\obeyspaces\let =\tie}
--
-- % If an index command is used in an @example environment, any spaces
-- % therein should become regular spaces in the raw index file, not the
-- % expansion of \tie (\leavevmode \penalty \@M \ ).
-- \gdef\unsepspaces{\let =\space}
--}
--
--
--\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
--
--% Define the framework for environments in texinfo.tex. It's used like this:
--%
--% \envdef\foo{...}
--% \def\Efoo{...}
--%
--% It's the responsibility of \envdef to insert \begingroup before the
--% actual body; @end closes the group after calling \Efoo. \envdef also
--% defines \thisenv, so the current environment is known; @end checks
--% whether the environment name matches. The \checkenv macro can also be
--% used to check whether the current environment is the one expected.
--%
--% Non-false conditionals (@iftex, @ifset) don't fit into this, so they
--% are not treated as enviroments; they don't open a group. (The
--% implementation of @end takes care not to call \endgroup in this
--% special case.)
--
--
--% At runtime, environments start with this:
--\def\startenvironment#1{\begingroup\def\thisenv{#1}}
--% initialize
--\let\thisenv\empty
--
--% ... but they get defined via ``\envdef\foo{...}'':
--\long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
--\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
--
--% Check whether we're in the right environment:
--\def\checkenv#1{%
-- \def\temp{#1}%
-- \ifx\thisenv\temp
-- \else
-- \badenverr
-- \fi
--}
--
--% Evironment mismatch, #1 expected:
--\def\badenverr{%
-- \errhelp = \EMsimple
-- \errmessage{This command can appear only \inenvironment\temp,
-- not \inenvironment\thisenv}%
--}
--\def\inenvironment#1{%
-- \ifx#1\empty
-- out of any environment%
-- \else
-- in environment \expandafter\string#1%
-- \fi
--}
--
--% @end foo executes the definition of \Efoo.
--% But first, it executes a specialized version of \checkenv
--%
--\parseargdef\end{%
-- \if 1\csname iscond.#1\endcsname
-- \else
-- % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03
-- \expandafter\checkenv\csname#1\endcsname
-- \csname E#1\endcsname
-- \endgroup
-- \fi
--}
--
--\newhelp\EMsimple{Press RETURN to continue.}
--
--
--%% Simple single-character @ commands
--
--% @@ prints an @
--% Kludge this until the fonts are right (grr).
--\def\@{{\tt\char64}}
--
--% This is turned off because it was never documented
--% and you can use @w{...} around a quote to suppress ligatures.
--%% Define @` and @' to be the same as ` and '
--%% but suppressing ligatures.
--%\def\`{{`}}
--%\def\'{{'}}
--
--% Used to generate quoted braces.
--\def\mylbrace {{\tt\char123}}
--\def\myrbrace {{\tt\char125}}
--\let\{=\mylbrace
--\let\}=\myrbrace
--\begingroup
-- % Definitions to produce \{ and \} commands for indices,
-- % and @{ and @} for the aux/toc files.
-- \catcode`\{ = \other \catcode`\} = \other
-- \catcode`\[ = 1 \catcode`\] = 2
-- \catcode`\! = 0 \catcode`\\ = \other
-- !gdef!lbracecmd[\{]%
-- !gdef!rbracecmd[\}]%
-- !gdef!lbraceatcmd[@{]%
-- !gdef!rbraceatcmd[@}]%
--!endgroup
--
--% @comma{} to avoid , parsing problems.
--\let\comma = ,
--
--% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
--% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
--\let\, = \c
--\let\dotaccent = \.
--\def\ringaccent#1{{\accent23 #1}}
--\let\tieaccent = \t
--\let\ubaraccent = \b
--\let\udotaccent = \d
--
--% Other special characters: @questiondown @exclamdown @ordf @ordm
--% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
--\def\questiondown{?`}
--\def\exclamdown{!`}
--\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
--\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
--
--% Dotless i and dotless j, used for accents.
--\def\imacro{i}
--\def\jmacro{j}
--\def\dotless#1{%
-- \def\temp{#1}%
-- \ifx\temp\imacro \ptexi
-- \else\ifx\temp\jmacro \j
-- \else \errmessage{@dotless can be used only with i or j}%
-- \fi\fi
--}
--
--% The \TeX{} logo, as in plain, but resetting the spacing so that a
--% period following counts as ending a sentence. (Idea found in latex.)
--%
--\edef\TeX{\TeX \spacefactor=1000 }
--
--% @LaTeX{} logo. Not quite the same results as the definition in
--% latex.ltx, since we use a different font for the raised A; it's most
--% convenient for us to use an explicitly smaller font, rather than using
--% the \scriptstyle font (since we don't reset \scriptstyle and
--% \scriptscriptstyle).
--%
--\def\LaTeX{%
-- L\kern-.36em
-- {\setbox0=\hbox{T}%
-- \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
-- \kern-.15em
-- \TeX
--}
--
--% Be sure we're in horizontal mode when doing a tie, since we make space
--% equivalent to this in @example-like environments. Otherwise, a space
--% at the beginning of a line will start with \penalty -- and
--% since \penalty is valid in vertical mode, we'd end up putting the
--% penalty on the vertical list instead of in the new paragraph.
--{\catcode`@ = 11
-- % Avoid using \@M directly, because that causes trouble
-- % if the definition is written into an index file.
-- \global\let\tiepenalty = \@M
-- \gdef\tie{\leavevmode\penalty\tiepenalty\ }
--}
--
--% @: forces normal size whitespace following.
--\def\:{\spacefactor=1000 }
--
--% @* forces a line break.
--\def\*{\hfil\break\hbox{}\ignorespaces}
--
--% @/ allows a line break.
--\let\/=\allowbreak
--
--% @. is an end-of-sentence period.
--\def\.{.\spacefactor=\endofsentencespacefactor\space}
--
--% @! is an end-of-sentence bang.
--\def\!{!\spacefactor=\endofsentencespacefactor\space}
--
--% @? is an end-of-sentence query.
--\def\?{?\spacefactor=\endofsentencespacefactor\space}
--
--% @frenchspacing on|off says whether to put extra space after punctuation.
--%
--\def\onword{on}
--\def\offword{off}
--%
--\parseargdef\frenchspacing{%
-- \def\temp{#1}%
-- \ifx\temp\onword \plainfrenchspacing
-- \else\ifx\temp\offword \plainnonfrenchspacing
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
-- \fi\fi
--}
--
--% @w prevents a word break. Without the \leavevmode, @w at the
--% beginning of a paragraph, when TeX is still in vertical mode, would
--% produce a whole line of output instead of starting the paragraph.
--\def\w#1{\leavevmode\hbox{#1}}
--
--% @group ... @end group forces ... to be all on one page, by enclosing
--% it in a TeX vbox. We use \vtop instead of \vbox to construct the box
--% to keep its height that of a normal line. According to the rules for
--% \topskip (p.114 of the TeXbook), the glue inserted is
--% max (\topskip - \ht (first item), 0). If that height is large,
--% therefore, no glue is inserted, and the space between the headline and
--% the text is small, which looks bad.
--%
--% Another complication is that the group might be very large. This can
--% cause the glue on the previous page to be unduly stretched, because it
--% does not have much material. In this case, it's better to add an
--% explicit \vfill so that the extra space is at the bottom. The
--% threshold for doing this is if the group is more than \vfilllimit
--% percent of a page (\vfilllimit can be changed inside of @tex).
--%
--\newbox\groupbox
--\def\vfilllimit{0.7}
--%
--\envdef\group{%
-- \ifnum\catcode`\^^M=\active \else
-- \errhelp = \groupinvalidhelp
-- \errmessage{@group invalid in context where filling is enabled}%
-- \fi
-- \startsavinginserts
-- %
-- \setbox\groupbox = \vtop\bgroup
-- % Do @comment since we are called inside an environment such as
-- % @example, where each end-of-line in the input causes an
-- % end-of-line in the output. We don't want the end-of-line after
-- % the `@group' to put extra space in the output. Since @group
-- % should appear on a line by itself (according to the Texinfo
-- % manual), we don't worry about eating any user text.
-- \comment
--}
--%
--% The \vtop produces a box with normal height and large depth; thus, TeX puts
--% \baselineskip glue before it, and (when the next line of text is done)
--% \lineskip glue after it. Thus, space below is not quite equal to space
--% above. But it's pretty close.
--\def\Egroup{%
-- % To get correct interline space between the last line of the group
-- % and the first line afterwards, we have to propagate \prevdepth.
-- \endgraf % Not \par, as it may have been set to \lisppar.
-- \global\dimen1 = \prevdepth
-- \egroup % End the \vtop.
-- % \dimen0 is the vertical size of the group's box.
-- \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox
-- % \dimen2 is how much space is left on the page (more or less).
-- \dimen2 = \pageheight \advance\dimen2 by -\pagetotal
-- % if the group doesn't fit on the current page, and it's a big big
-- % group, force a page break.
-- \ifdim \dimen0 > \dimen2
-- \ifdim \pagetotal < \vfilllimit\pageheight
-- \page
-- \fi
-- \fi
-- \box\groupbox
-- \prevdepth = \dimen1
-- \checkinserts
--}
--%
--% TeX puts in an \escapechar (i.e., `@') at the beginning of the help
--% message, so this ends up printing `@group can only ...'.
--%
--\newhelp\groupinvalidhelp{%
--group can only be used in environments such as @example,^^J%
--where each line of input produces a line of output.}
--
--% @need space-in-mils
--% forces a page break if there is not space-in-mils remaining.
--
--\newdimen\mil \mil=0.001in
--
--% Old definition--didn't work.
--%\parseargdef\need{\par %
--%% This method tries to make TeX break the page naturally
--%% if the depth of the box does not fit.
--%{\baselineskip=0pt%
--%\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak
--%\prevdepth=-1000pt
--%}}
--
--\parseargdef\need{%
-- % Ensure vertical mode, so we don't make a big box in the middle of a
-- % paragraph.
-- \par
-- %
-- % If the @need value is less than one line space, it's useless.
-- \dimen0 = #1\mil
-- \dimen2 = \ht\strutbox
-- \advance\dimen2 by \dp\strutbox
-- \ifdim\dimen0 > \dimen2
-- %
-- % Do a \strut just to make the height of this box be normal, so the
-- % normal leading is inserted relative to the preceding line.
-- % And a page break here is fine.
-- \vtop to #1\mil{\strut\vfil}%
-- %
-- % TeX does not even consider page breaks if a penalty added to the
-- % main vertical list is 10000 or more. But in order to see if the
-- % empty box we just added fits on the page, we must make it consider
-- % page breaks. On the other hand, we don't want to actually break the
-- % page after the empty box. So we use a penalty of 9999.
-- %
-- % There is an extremely small chance that TeX will actually break the
-- % page at this \penalty, if there are no other feasible breakpoints in
-- % sight. (If the user is using lots of big @group commands, which
-- % almost-but-not-quite fill up a page, TeX will have a hard time doing
-- % good page breaking, for example.) However, I could not construct an
-- % example where a page broke at this \penalty; if it happens in a real
-- % document, then we can reconsider our strategy.
-- \penalty9999
-- %
-- % Back up by the size of the box, whether we did a page break or not.
-- \kern -#1\mil
-- %
-- % Do not allow a page break right after this kern.
-- \nobreak
-- \fi
--}
--
--% @br forces paragraph break (and is undocumented).
--
--\let\br = \par
--
--% @page forces the start of a new page.
--%
--\def\page{\par\vfill\supereject}
--
--% @exdent text....
--% outputs text on separate line in roman font, starting at standard page margin
--
--% This records the amount of indent in the innermost environment.
--% That's how much \exdent should take out.
--\newskip\exdentamount
--
--% This defn is used inside fill environments such as @defun.
--\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}
--
--% This defn is used inside nofill environments such as @example.
--\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount
-- \leftline{\hskip\leftskip{\rm#1}}}}
--
--% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
--% paragraph. For more general purposes, use the \margin insertion
--% class. WHICH is `l' or `r'.
--%
--\newskip\inmarginspacing \inmarginspacing=1cm
--\def\strutdepth{\dp\strutbox}
--%
--\def\doinmargin#1#2{\strut\vadjust{%
-- \nobreak
-- \kern-\strutdepth
-- \vtop to \strutdepth{%
-- \baselineskip=\strutdepth
-- \vss
-- % if you have multiple lines of stuff to put here, you'll need to
-- % make the vbox yourself of the appropriate size.
-- \ifx#1l%
-- \llap{\ignorespaces #2\hskip\inmarginspacing}%
-- \else
-- \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}%
-- \fi
-- \null
-- }%
--}}
--\def\inleftmargin{\doinmargin l}
--\def\inrightmargin{\doinmargin r}
--%
--% @inmargin{TEXT [, RIGHT-TEXT]}
--% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
--% else use TEXT for both).
--%
--\def\inmargin#1{\parseinmargin #1,,\finish}
--\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
-- \setbox0 = \hbox{\ignorespaces #2}%
-- \ifdim\wd0 > 0pt
-- \def\lefttext{#1}% have both texts
-- \def\righttext{#2}%
-- \else
-- \def\lefttext{#1}% have only one text
-- \def\righttext{#1}%
-- \fi
-- %
-- \ifodd\pageno
-- \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin
-- \else
-- \def\temp{\inleftmargin\lefttext}%
-- \fi
-- \temp
--}
--
--% @include file insert text of that file as input.
--%
--\def\include{\parseargusing\filenamecatcodes\includezzz}
--\def\includezzz#1{%
-- \pushthisfilestack
-- \def\thisfile{#1}%
-- {%
-- \makevalueexpandable
-- \def\temp{\input #1 }%
-- \expandafter
-- }\temp
-- \popthisfilestack
--}
--\def\filenamecatcodes{%
-- \catcode`\\=\other
-- \catcode`~=\other
-- \catcode`^=\other
-- \catcode`_=\other
-- \catcode`|=\other
-- \catcode`<=\other
-- \catcode`>=\other
-- \catcode`+=\other
-- \catcode`-=\other
--}
--
--\def\pushthisfilestack{%
-- \expandafter\pushthisfilestackX\popthisfilestack\StackTerm
--}
--\def\pushthisfilestackX{%
-- \expandafter\pushthisfilestackY\thisfile\StackTerm
--}
--\def\pushthisfilestackY #1\StackTerm #2\StackTerm {%
-- \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}%
--}
--
--\def\popthisfilestack{\errthisfilestackempty}
--\def\errthisfilestackempty{\errmessage{Internal error:
-- the stack of filenames is empty.}}
--
--\def\thisfile{}
--
--% @center line
--% outputs that line, centered.
--%
--\parseargdef\center{%
-- \ifhmode
-- \let\next\centerH
-- \else
-- \let\next\centerV
-- \fi
-- \next{\hfil \ignorespaces#1\unskip \hfil}%
--}
--\def\centerH#1{%
-- {%
-- \hfil\break
-- \advance\hsize by -\leftskip
-- \advance\hsize by -\rightskip
-- \line{#1}%
-- \break
-- }%
--}
--\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
--
--% @sp n outputs n lines of vertical space
--
--\parseargdef\sp{\vskip #1\baselineskip}
--
--% @comment ...line which is ignored...
--% @c is the same as @comment
--% @ignore ... @end ignore is another way to write a comment
--
--\def\comment{\begingroup \catcode`\^^M=\other%
--\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
--\commentxxx}
--{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
--
--\let\c=\comment
--
--% @paragraphindent NCHARS
--% We'll use ems for NCHARS, close enough.
--% NCHARS can also be the word `asis' or `none'.
--% We cannot feasibly implement @paragraphindent asis, though.
--%
--\def\asisword{asis} % no translation, these are keywords
--\def\noneword{none}
--%
--\parseargdef\paragraphindent{%
-- \def\temp{#1}%
-- \ifx\temp\asisword
-- \else
-- \ifx\temp\noneword
-- \defaultparindent = 0pt
-- \else
-- \defaultparindent = #1em
-- \fi
-- \fi
-- \parindent = \defaultparindent
--}
--
--% @exampleindent NCHARS
--% We'll use ems for NCHARS like @paragraphindent.
--% It seems @exampleindent asis isn't necessary, but
--% I preserve it to make it similar to @paragraphindent.
--\parseargdef\exampleindent{%
-- \def\temp{#1}%
-- \ifx\temp\asisword
-- \else
-- \ifx\temp\noneword
-- \lispnarrowing = 0pt
-- \else
-- \lispnarrowing = #1em
-- \fi
-- \fi
--}
--
--% @firstparagraphindent WORD
--% If WORD is `none', then suppress indentation of the first paragraph
--% after a section heading. If WORD is `insert', then do indent at such
--% paragraphs.
--%
--% The paragraph indentation is suppressed or not by calling
--% \suppressfirstparagraphindent, which the sectioning commands do.
--% We switch the definition of this back and forth according to WORD.
--% By default, we suppress indentation.
--%
--\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
--\def\insertword{insert}
--%
--\parseargdef\firstparagraphindent{%
-- \def\temp{#1}%
-- \ifx\temp\noneword
-- \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent
-- \else\ifx\temp\insertword
-- \let\suppressfirstparagraphindent = \relax
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @firstparagraphindent option `\temp'}%
-- \fi\fi
--}
--
--% Here is how we actually suppress indentation. Redefine \everypar to
--% \kern backwards by \parindent, and then reset itself to empty.
--%
--% We also make \indent itself not actually do anything until the next
--% paragraph.
--%
--\gdef\dosuppressfirstparagraphindent{%
-- \gdef\indent{%
-- \restorefirstparagraphindent
-- \indent
-- }%
-- \gdef\noindent{%
-- \restorefirstparagraphindent
-- \noindent
-- }%
-- \global\everypar = {%
-- \kern -\parindent
-- \restorefirstparagraphindent
-- }%
--}
--
--\gdef\restorefirstparagraphindent{%
-- \global \let \indent = \ptexindent
-- \global \let \noindent = \ptexnoindent
-- \global \everypar = {}%
--}
--
--
--% @asis just yields its argument. Used with @table, for example.
--%
--\def\asis#1{#1}
--
--% @math outputs its argument in math mode.
--%
--% One complication: _ usually means subscripts, but it could also mean
--% an actual _ character, as in @math{@var{some_variable} + 1}. So make
--% _ active, and distinguish by seeing if the current family is \slfam,
--% which is what @var uses.
--{
-- \catcode`\_ = \active
-- \gdef\mathunderscore{%
-- \catcode`\_=\active
-- \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-- }
--}
--% Another complication: we want \\ (and @\) to output a \ character.
--% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
--% this is not advertised and we don't care. Texinfo does not
--% otherwise define @\.
--%
--% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
--\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
--%
--\def\math{%
-- \tex
-- \mathunderscore
-- \let\\ = \mathbackslash
-- \mathactive
-- $\finishmath
--}
--\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex.
--
--% Some active characters (such as <) are spaced differently in math.
--% We have to reset their definitions in case the @math was an argument
--% to a command which sets the catcodes (such as @item or @section).
--%
--{
-- \catcode`^ = \active
-- \catcode`< = \active
-- \catcode`> = \active
-- \catcode`+ = \active
-- \gdef\mathactive{%
-- \let^ = \ptexhat
-- \let< = \ptexless
-- \let> = \ptexgtr
-- \let+ = \ptexplus
-- }
--}
--
--% @bullet and @minus need the same treatment as @math, just above.
--\def\bullet{$\ptexbullet$}
--\def\minus{$-$}
--
--% @dots{} outputs an ellipsis using the current font.
--% We do .5em per period so that it has the same spacing in the cm
--% typewriter fonts as three actual period characters; on the other hand,
--% in other typewriter fonts three periods are wider than 1.5em. So do
--% whichever is larger.
--%
--\def\dots{%
-- \leavevmode
-- \setbox0=\hbox{...}% get width of three periods
-- \ifdim\wd0 > 1.5em
-- \dimen0 = \wd0
-- \else
-- \dimen0 = 1.5em
-- \fi
-- \hbox to \dimen0{%
-- \hskip 0pt plus.25fil
-- .\hskip 0pt plus1fil
-- .\hskip 0pt plus1fil
-- .\hskip 0pt plus.5fil
-- }%
--}
--
--% @enddots{} is an end-of-sentence ellipsis.
--%
--\def\enddots{%
-- \dots
-- \spacefactor=\endofsentencespacefactor
--}
--
--% @comma{} is so commas can be inserted into text without messing up
--% Texinfo's parsing.
--%
--\let\comma = ,
--
--% @refill is a no-op.
--\let\refill=\relax
--
--% If working on a large document in chapters, it is convenient to
--% be able to disable indexing, cross-referencing, and contents, for test runs.
--% This is done with @novalidate (before @setfilename).
--%
--\newif\iflinks \linkstrue % by default we want the aux files.
--\let\novalidate = \linksfalse
--
--% @setfilename is done at the beginning of every texinfo file.
--% So open here the files we need to have open while reading the input.
--% This makes it possible to make a .fmt file for texinfo.
--\def\setfilename{%
-- \fixbackslash % Turn off hack to swallow `\input texinfo'.
-- \iflinks
-- \tryauxfile
-- % Open the new aux file. TeX will close it automatically at exit.
-- \immediate\openout\auxfile=\jobname.aux
-- \fi % \openindices needs to do some work in any case.
-- \openindices
-- \let\setfilename=\comment % Ignore extra @setfilename cmds.
-- %
-- % If texinfo.cnf is present on the system, read it.
-- % Useful for site-wide @afourpaper, etc.
-- \openin 1 texinfo.cnf
-- \ifeof 1 \else \input texinfo.cnf \fi
-- \closein 1
-- %
-- \comment % Ignore the actual filename.
--}
--
--% Called from \setfilename.
--%
--\def\openindices{%
-- \newindex{cp}%
-- \newcodeindex{fn}%
-- \newcodeindex{vr}%
-- \newcodeindex{tp}%
-- \newcodeindex{ky}%
-- \newcodeindex{pg}%
--}
--
--% @bye.
--\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
--
--
--\message{pdf,}
--% adobe `portable' document format
--\newcount\tempnum
--\newcount\lnkcount
--\newtoks\filename
--\newcount\filenamelength
--\newcount\pgn
--\newtoks\toksA
--\newtoks\toksB
--\newtoks\toksC
--\newtoks\toksD
--\newbox\boxA
--\newcount\countA
--\newif\ifpdf
--\newif\ifpdfmakepagedest
--
--% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
--% can be set). So we test for \relax and 0 as well as \undefined,
--% borrowed from ifpdf.sty.
--\ifx\pdfoutput\undefined
--\else
-- \ifx\pdfoutput\relax
-- \else
-- \ifcase\pdfoutput
-- \else
-- \pdftrue
-- \fi
-- \fi
--\fi
--
--% PDF uses PostScript string constants for the names of xref targets,
--% for display in the outlines, and in other places. Thus, we have to
--% double any backslashes. Otherwise, a name like "\node" will be
--% interpreted as a newline (\n), followed by o, d, e. Not good.
--% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
--% (and related messages, the final outcome is that it is up to the TeX
--% user to double the backslashes and otherwise make the string valid, so
--% that's what we do).
--
--% double active backslashes.
--%
--{\catcode`\@=0 \catcode`\\=\active
-- @gdef at activebackslashdouble{%
-- @catcode`@\=@active
-- @let\=@doublebackslash}
--}
--
--% To handle parens, we must adopt a different approach, since parens are
--% not active characters. hyperref.dtx (which has the same problem as
--% us) handles it with this amazing macro to replace tokens, with minor
--% changes for Texinfo. It is included here under the GPL by permission
--% from the author, Heiko Oberdiek.
--%
--% #1 is the tokens to replace.
--% #2 is the replacement.
--% #3 is the control sequence with the string.
--%
--\def\HyPsdSubst#1#2#3{%
-- \def\HyPsdReplace##1#1##2\END{%
-- ##1%
-- \ifx\\##2\\%
-- \else
-- #2%
-- \HyReturnAfterFi{%
-- \HyPsdReplace##2\END
-- }%
-- \fi
-- }%
-- \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
--}
--\long\def\HyReturnAfterFi#1\fi{\fi#1}
--
--% #1 is a control sequence in which to do the replacements.
--\def\backslashparens#1{%
-- \xdef#1{#1}% redefine it as its expansion; the definition is simply
-- % \lastnode when called from \setref -> \pdfmkdest.
-- \HyPsdSubst{(}{\realbackslash(}{#1}%
-- \HyPsdSubst{)}{\realbackslash)}{#1}%
--}
--
--\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
--with PDF output, and none of those formats could be found. (.eps cannot
--be supported due to the design of the PDF format; use regular TeX (DVI
--output) for that.)}
--
--\ifpdf
-- \input pdfcolor
-- \pdfcatalog{/PageMode /UseOutlines}
-- %
-- % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
-- \def\dopdfimage#1#2#3{%
-- \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
-- \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
-- %
-- % pdftex (and the PDF format) support .png, .jpg, .pdf (among
-- % others). Let's try in that order.
-- \let\pdfimgext=\empty
-- \begingroup
-- \openin 1 #1.png \ifeof 1
-- \openin 1 #1.jpg \ifeof 1
-- \openin 1 #1.jpeg \ifeof 1
-- \openin 1 #1.JPG \ifeof 1
-- \openin 1 #1.pdf \ifeof 1
-- \errhelp = \nopdfimagehelp
-- \errmessage{Could not find image file #1 for pdf}%
-- \else \gdef\pdfimgext{pdf}%
-- \fi
-- \else \gdef\pdfimgext{JPG}%
-- \fi
-- \else \gdef\pdfimgext{jpeg}%
-- \fi
-- \else \gdef\pdfimgext{jpg}%
-- \fi
-- \else \gdef\pdfimgext{png}%
-- \fi
-- \closein 1
-- \endgroup
-- %
-- % without \immediate, pdftex seg faults when the same image is
-- % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.)
-- \ifnum\pdftexversion < 14
-- \immediate\pdfimage
-- \else
-- \immediate\pdfximage
-- \fi
-- \ifdim \wd0 >0pt width \imagewidth \fi
-- \ifdim \wd2 >0pt height \imageheight \fi
-- \ifnum\pdftexversion<13
-- #1.\pdfimgext
-- \else
-- {#1.\pdfimgext}%
-- \fi
-- \ifnum\pdftexversion < 14 \else
-- \pdfrefximage \pdflastximage
-- \fi}
-- %
-- \def\pdfmkdest#1{{%
-- % We have to set dummies so commands such as @code, and characters
-- % such as \, aren't expanded when present in a section title.
-- \indexnofonts
-- \turnoffactive
-- \activebackslashdouble
-- \makevalueexpandable
-- \def\pdfdestname{#1}%
-- \backslashparens\pdfdestname
-- \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
-- }}
-- %
-- % used to mark target names; must be expandable.
-- \def\pdfmkpgn#1{#1}
-- %
-- % by default, use a color that is dark enough to print on paper as
-- % nearly black, but still distinguishable for online viewing.
-- % (Defined in pdfcolor.tex.)
-- \let\urlcolor = \BrickRed
-- \let\linkcolor = \BrickRed
-- \def\endlink{\Black\pdfendlink}
-- %
-- % Adding outlines to PDF; macros for calculating structure of outlines
-- % come from Petr Olsak
-- \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
-- \else \csname#1\endcsname \fi}
-- \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
-- \advance\tempnum by 1
-- \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
-- %
-- % #1 is the section text, which is what will be displayed in the
-- % outline by the pdf viewer. #2 is the pdf expression for the number
-- % of subentries (or empty, for subsubsections). #3 is the node text,
-- % which might be empty if this toc entry had no corresponding node.
-- % #4 is the page number
-- %
-- \def\dopdfoutline#1#2#3#4{%
-- % Generate a link to the node text if that exists; else, use the
-- % page number. We could generate a destination for the section
-- % text in the case where a section has no node, but it doesn't
-- % seem worth the trouble, since most documents are normally structured.
-- \def\pdfoutlinedest{#3}%
-- \ifx\pdfoutlinedest\empty
-- \def\pdfoutlinedest{#4}%
-- \else
-- % Doubled backslashes in the name.
-- {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
-- \backslashparens\pdfoutlinedest}%
-- \fi
-- %
-- % Also double the backslashes in the display string.
-- {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
-- \backslashparens\pdfoutlinetext}%
-- %
-- \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
-- }
-- %
-- \def\pdfmakeoutlines{%
-- \begingroup
-- % Thanh's hack / proper braces in bookmarks
-- \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
-- \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
-- %
-- % Read toc silently, to get counts of subentries for \pdfoutline.
-- \def\numchapentry##1##2##3##4{%
-- \def\thischapnum{##2}%
-- \def\thissecnum{0}%
-- \def\thissubsecnum{0}%
-- }%
-- \def\numsecentry##1##2##3##4{%
-- \advancenumber{chap\thischapnum}%
-- \def\thissecnum{##2}%
-- \def\thissubsecnum{0}%
-- }%
-- \def\numsubsecentry##1##2##3##4{%
-- \advancenumber{sec\thissecnum}%
-- \def\thissubsecnum{##2}%
-- }%
-- \def\numsubsubsecentry##1##2##3##4{%
-- \advancenumber{subsec\thissubsecnum}%
-- }%
-- \def\thischapnum{0}%
-- \def\thissecnum{0}%
-- \def\thissubsecnum{0}%
-- %
-- % use \def rather than \let here because we redefine \chapentry et
-- % al. a second time, below.
-- \def\appentry{\numchapentry}%
-- \def\appsecentry{\numsecentry}%
-- \def\appsubsecentry{\numsubsecentry}%
-- \def\appsubsubsecentry{\numsubsubsecentry}%
-- \def\unnchapentry{\numchapentry}%
-- \def\unnsecentry{\numsecentry}%
-- \def\unnsubsecentry{\numsubsecentry}%
-- \def\unnsubsubsecentry{\numsubsubsecentry}%
-- \readdatafile{toc}%
-- %
-- % Read toc second time, this time actually producing the outlines.
-- % The `-' means take the \expnumber as the absolute number of
-- % subentries, which we calculated on our first read of the .toc above.
-- %
-- % We use the node names as the destinations.
-- \def\numchapentry##1##2##3##4{%
-- \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}%
-- \def\numsecentry##1##2##3##4{%
-- \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}%
-- \def\numsubsecentry##1##2##3##4{%
-- \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}%
-- \def\numsubsubsecentry##1##2##3##4{% count is always zero
-- \dopdfoutline{##1}{}{##3}{##4}}%
-- %
-- % PDF outlines are displayed using system fonts, instead of
-- % document fonts. Therefore we cannot use special characters,
-- % since the encoding is unknown. For example, the eogonek from
-- % Latin 2 (0xea) gets translated to a | character. Info from
-- % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
-- %
-- % xx to do this right, we have to translate 8-bit characters to
-- % their "best" equivalent, based on the @documentencoding. Right
-- % now, I guess we'll just let the pdf reader have its way.
-- \indexnofonts
-- \setupdatafile
-- \catcode`\\=\active \otherbackslash
-- \input \jobname.toc
-- \endgroup
-- }
-- %
-- \def\skipspaces#1{\def\PP{#1}\def\D{|}%
-- \ifx\PP\D\let\nextsp\relax
-- \else\let\nextsp\skipspaces
-- \ifx\p\space\else\addtokens{\filename}{\PP}%
-- \advance\filenamelength by 1
-- \fi
-- \fi
-- \nextsp}
-- \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
-- \ifnum\pdftexversion < 14
-- \let \startlink \pdfannotlink
-- \else
-- \let \startlink \pdfstartlink
-- \fi
-- % make a live url in pdf output.
-- \def\pdfurl#1{%
-- \begingroup
-- % it seems we really need yet another set of dummies; have not
-- % tried to figure out what each command should do in the context
-- % of @url. for now, just make @/ a no-op, that's the only one
-- % people have actually reported a problem with.
-- %
-- \normalturnoffactive
-- \def\@{@}%
-- \let\/=\empty
-- \makevalueexpandable
-- \leavevmode\urlcolor
-- \startlink attr{/Border [0 0 0]}%
-- user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
-- \endgroup}
-- \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
-- \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
-- \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
-- \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
-- \def\maketoks{%
-- \expandafter\poptoks\the\toksA|ENDTOKS|\relax
-- \ifx\first0\adn0
-- \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
-- \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
-- \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
-- \else
-- \ifnum0=\countA\else\makelink\fi
-- \ifx\first.\let\next=\done\else
-- \let\next=\maketoks
-- \addtokens{\toksB}{\the\toksD}
-- \ifx\first,\addtokens{\toksB}{\space}\fi
-- \fi
-- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
-- \next}
-- \def\makelink{\addtokens{\toksB}%
-- {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
-- \def\pdflink#1{%
-- \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
-- \linkcolor #1\endlink}
-- \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
--\else
-- \let\pdfmkdest = \gobble
-- \let\pdfurl = \gobble
-- \let\endlink = \relax
-- \let\linkcolor = \relax
-- \let\pdfmakeoutlines = \relax
--\fi % \ifx\pdfoutput
--
--
--\message{fonts,}
--
--% Change the current font style to #1, remembering it in \curfontstyle.
--% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
--% italics, not bold italics.
--%
--\def\setfontstyle#1{%
-- \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
-- \csname ten#1\endcsname % change the current font
--}
--
--% Select #1 fonts with the current style.
--%
--\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
--
--\def\rm{\fam=0 \setfontstyle{rm}}
--\def\it{\fam=\itfam \setfontstyle{it}}
--\def\sl{\fam=\slfam \setfontstyle{sl}}
--\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
--\def\tt{\fam=\ttfam \setfontstyle{tt}}
--
--% Texinfo sort of supports the sans serif font style, which plain TeX does not.
--% So we set up a \sf.
--\newfam\sffam
--\def\sf{\fam=\sffam \setfontstyle{sf}}
--\let\li = \sf % Sometimes we call it \li, not \sf.
--
--% We don't need math for this font style.
--\def\ttsl{\setfontstyle{ttsl}}
--
--
--% Default leading.
--\newdimen\textleading \textleading = 13.2pt
--
--% Set the baselineskip to #1, and the lineskip and strut size
--% correspondingly. There is no deep meaning behind these magic numbers
--% used as factors; they just match (closely enough) what Knuth defined.
--%
--\def\lineskipfactor{.08333}
--\def\strutheightpercent{.70833}
--\def\strutdepthpercent {.29167}
--%
--\def\setleading#1{%
-- \normalbaselineskip = #1\relax
-- \normallineskip = \lineskipfactor\normalbaselineskip
-- \normalbaselines
-- \setbox\strutbox =\hbox{%
-- \vrule width0pt height\strutheightpercent\baselineskip
-- depth \strutdepthpercent \baselineskip
-- }%
--}
--
--%
--% PDF CMaps. See also LaTeX's t1.cmap.
--%
--% \cmapOT1
--\ifpdf
-- \begingroup
-- \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
-- \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
--%%DocumentNeededResources: ProcSet (CIDInit)
--%%IncludeResource: ProcSet (CIDInit)
--%%BeginResource: CMap (TeX-OT1-0)
--%%Title: (TeX-OT1-0 TeX OT1 0)
--%%Version: 1.000
--%%EndComments
--/CIDInit /ProcSet findresource begin
--12 dict begin
--begincmap
--/CIDSystemInfo
--<< /Registry (TeX)
--/Ordering (OT1)
--/Supplement 0
-->> def
--/CMapName /TeX-OT1-0 def
--/CMapType 2 def
--1 begincodespacerange
--<00> <7F>
--endcodespacerange
--8 beginbfrange
--<00> <01> <0393>
--<09> <0A> <03A8>
--<23> <26> <0023>
--<28> <3B> <0028>
--<3F> <5B> <003F>
--<5D> <5E> <005D>
--<61> <7A> <0061>
--<7B> <7C> <2013>
--endbfrange
--40 beginbfchar
--<02> <0398>
--<03> <039B>
--<04> <039E>
--<05> <03A0>
--<06> <03A3>
--<07> <03D2>
--<08> <03A6>
--<0B> <00660066>
--<0C> <00660069>
--<0D> <0066006C>
--<0E> <006600660069>
--<0F> <00660066006C>
--<10> <0131>
--<11> <0237>
--<12> <0060>
--<13> <00B4>
--<14> <02C7>
--<15> <02D8>
--<16> <00AF>
--<17> <02DA>
--<18> <00B8>
--<19> <00DF>
--<1A> <00E6>
--<1B> <0153>
--<1C> <00F8>
--<1D> <00C6>
--<1E> <0152>
--<1F> <00D8>
--<21> <0021>
--<22> <201D>
--<27> <2019>
--<3C> <00A1>
--<3D> <003D>
--<3E> <00BF>
--<5C> <201C>
--<5F> <02D9>
--<60> <2018>
--<7D> <02DD>
--<7E> <007E>
--<7F> <00A8>
--endbfchar
--endcmap
--CMapName currentdict /CMap defineresource pop
--end
--end
--%%EndResource
--%%EOF
-- }\endgroup
-- \expandafter\edef\csname cmapOT1\endcsname#1{%
-- \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
-- }%
--%
--% \cmapOT1IT
-- \begingroup
-- \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
-- \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
--%%DocumentNeededResources: ProcSet (CIDInit)
--%%IncludeResource: ProcSet (CIDInit)
--%%BeginResource: CMap (TeX-OT1IT-0)
--%%Title: (TeX-OT1IT-0 TeX OT1IT 0)
--%%Version: 1.000
--%%EndComments
--/CIDInit /ProcSet findresource begin
--12 dict begin
--begincmap
--/CIDSystemInfo
--<< /Registry (TeX)
--/Ordering (OT1IT)
--/Supplement 0
-->> def
--/CMapName /TeX-OT1IT-0 def
--/CMapType 2 def
--1 begincodespacerange
--<00> <7F>
--endcodespacerange
--8 beginbfrange
--<00> <01> <0393>
--<09> <0A> <03A8>
--<25> <26> <0025>
--<28> <3B> <0028>
--<3F> <5B> <003F>
--<5D> <5E> <005D>
--<61> <7A> <0061>
--<7B> <7C> <2013>
--endbfrange
--42 beginbfchar
--<02> <0398>
--<03> <039B>
--<04> <039E>
--<05> <03A0>
--<06> <03A3>
--<07> <03D2>
--<08> <03A6>
--<0B> <00660066>
--<0C> <00660069>
--<0D> <0066006C>
--<0E> <006600660069>
--<0F> <00660066006C>
--<10> <0131>
--<11> <0237>
--<12> <0060>
--<13> <00B4>
--<14> <02C7>
--<15> <02D8>
--<16> <00AF>
--<17> <02DA>
--<18> <00B8>
--<19> <00DF>
--<1A> <00E6>
--<1B> <0153>
--<1C> <00F8>
--<1D> <00C6>
--<1E> <0152>
--<1F> <00D8>
--<21> <0021>
--<22> <201D>
--<23> <0023>
--<24> <00A3>
--<27> <2019>
--<3C> <00A1>
--<3D> <003D>
--<3E> <00BF>
--<5C> <201C>
--<5F> <02D9>
--<60> <2018>
--<7D> <02DD>
--<7E> <007E>
--<7F> <00A8>
--endbfchar
--endcmap
--CMapName currentdict /CMap defineresource pop
--end
--end
--%%EndResource
--%%EOF
-- }\endgroup
-- \expandafter\edef\csname cmapOT1IT\endcsname#1{%
-- \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
-- }%
--%
--% \cmapOT1TT
-- \begingroup
-- \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
-- \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
--%%DocumentNeededResources: ProcSet (CIDInit)
--%%IncludeResource: ProcSet (CIDInit)
--%%BeginResource: CMap (TeX-OT1TT-0)
--%%Title: (TeX-OT1TT-0 TeX OT1TT 0)
--%%Version: 1.000
--%%EndComments
--/CIDInit /ProcSet findresource begin
--12 dict begin
--begincmap
--/CIDSystemInfo
--<< /Registry (TeX)
--/Ordering (OT1TT)
--/Supplement 0
-->> def
--/CMapName /TeX-OT1TT-0 def
--/CMapType 2 def
--1 begincodespacerange
--<00> <7F>
--endcodespacerange
--5 beginbfrange
--<00> <01> <0393>
--<09> <0A> <03A8>
--<21> <26> <0021>
--<28> <5F> <0028>
--<61> <7E> <0061>
--endbfrange
--32 beginbfchar
--<02> <0398>
--<03> <039B>
--<04> <039E>
--<05> <03A0>
--<06> <03A3>
--<07> <03D2>
--<08> <03A6>
--<0B> <2191>
--<0C> <2193>
--<0D> <0027>
--<0E> <00A1>
--<0F> <00BF>
--<10> <0131>
--<11> <0237>
--<12> <0060>
--<13> <00B4>
--<14> <02C7>
--<15> <02D8>
--<16> <00AF>
--<17> <02DA>
--<18> <00B8>
--<19> <00DF>
--<1A> <00E6>
--<1B> <0153>
--<1C> <00F8>
--<1D> <00C6>
--<1E> <0152>
--<1F> <00D8>
--<20> <2423>
--<27> <2019>
--<60> <2018>
--<7F> <00A8>
--endbfchar
--endcmap
--CMapName currentdict /CMap defineresource pop
--end
--end
--%%EndResource
--%%EOF
-- }\endgroup
-- \expandafter\edef\csname cmapOT1TT\endcsname#1{%
-- \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
-- }%
--\else
-- \expandafter\let\csname cmapOT1\endcsname\gobble
-- \expandafter\let\csname cmapOT1IT\endcsname\gobble
-- \expandafter\let\csname cmapOT1TT\endcsname\gobble
--\fi
--
--
--% Set the font macro #1 to the font named #2, adding on the
--% specified font prefix (normally `cm').
--% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
--% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
--% empty to omit).
--\def\setfont#1#2#3#4#5{%
-- \font#1=\fontprefix#2#3 scaled #4
-- \csname cmap#5\endcsname#1%
--}
--% This is what gets called when #5 of \setfont is empty.
--\let\cmap\gobble
--
--
--% Use cm as the default font prefix.
--% To specify the font prefix, you must define \fontprefix
--% before you read in texinfo.tex.
--\ifx\fontprefix\undefined
--\def\fontprefix{cm}
--\fi
--% Support font families that don't use the same naming scheme as CM.
--\def\rmshape{r}
--\def\rmbshape{bx} %where the normal face is bold
--\def\bfshape{b}
--\def\bxshape{bx}
--\def\ttshape{tt}
--\def\ttbshape{tt}
--\def\ttslshape{sltt}
--\def\itshape{ti}
--\def\itbshape{bxti}
--\def\slshape{sl}
--\def\slbshape{bxsl}
--\def\sfshape{ss}
--\def\sfbshape{ss}
--\def\scshape{csc}
--\def\scbshape{csc}
--
--% Definitions for a main text size of 11pt. This is the default in
--% Texinfo.
--%
--\def\definetextfontsizexi{%
--% Text fonts (11.2pt, magstep1).
--\def\textnominalsize{11pt}
--\edef\mainmagstep{\magstephalf}
--\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
--\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
--\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
--\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
--\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
--\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
--\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
--\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
--\font\texti=cmmi10 scaled \mainmagstep
--\font\textsy=cmsy10 scaled \mainmagstep
--
--% A few fonts for @defun names and args.
--\setfont\defbf\bfshape{10}{\magstep1}{OT1}
--\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
--\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
--\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
--
--% Fonts for indices, footnotes, small examples (9pt).
--\def\smallnominalsize{9pt}
--\setfont\smallrm\rmshape{9}{1000}{OT1}
--\setfont\smalltt\ttshape{9}{1000}{OT1TT}
--\setfont\smallbf\bfshape{10}{900}{OT1}
--\setfont\smallit\itshape{9}{1000}{OT1IT}
--\setfont\smallsl\slshape{9}{1000}{OT1}
--\setfont\smallsf\sfshape{9}{1000}{OT1}
--\setfont\smallsc\scshape{10}{900}{OT1}
--\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
--\font\smalli=cmmi9
--\font\smallsy=cmsy9
--
--% Fonts for small examples (8pt).
--\def\smallernominalsize{8pt}
--\setfont\smallerrm\rmshape{8}{1000}{OT1}
--\setfont\smallertt\ttshape{8}{1000}{OT1TT}
--\setfont\smallerbf\bfshape{10}{800}{OT1}
--\setfont\smallerit\itshape{8}{1000}{OT1IT}
--\setfont\smallersl\slshape{8}{1000}{OT1}
--\setfont\smallersf\sfshape{8}{1000}{OT1}
--\setfont\smallersc\scshape{10}{800}{OT1}
--\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
--\font\smalleri=cmmi8
--\font\smallersy=cmsy8
--
--% Fonts for title page (20.4pt):
--\def\titlenominalsize{20pt}
--\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
--\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
--\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
--\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
--\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
--\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
--\let\titlebf=\titlerm
--\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
--\font\titlei=cmmi12 scaled \magstep3
--\font\titlesy=cmsy10 scaled \magstep4
--\def\authorrm{\secrm}
--\def\authortt{\sectt}
--
--% Chapter (and unnumbered) fonts (17.28pt).
--\def\chapnominalsize{17pt}
--\setfont\chaprm\rmbshape{12}{\magstep2}{OT1}
--\setfont\chapit\itbshape{10}{\magstep3}{OT1IT}
--\setfont\chapsl\slbshape{10}{\magstep3}{OT1}
--\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT}
--\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT}
--\setfont\chapsf\sfbshape{17}{1000}{OT1}
--\let\chapbf=\chaprm
--\setfont\chapsc\scbshape{10}{\magstep3}{OT1}
--\font\chapi=cmmi12 scaled \magstep2
--\font\chapsy=cmsy10 scaled \magstep3
--
--% Section fonts (14.4pt).
--\def\secnominalsize{14pt}
--\setfont\secrm\rmbshape{12}{\magstep1}{OT1}
--\setfont\secit\itbshape{10}{\magstep2}{OT1IT}
--\setfont\secsl\slbshape{10}{\magstep2}{OT1}
--\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT}
--\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT}
--\setfont\secsf\sfbshape{12}{\magstep1}{OT1}
--\let\secbf\secrm
--\setfont\secsc\scbshape{10}{\magstep2}{OT1}
--\font\seci=cmmi12 scaled \magstep1
--\font\secsy=cmsy10 scaled \magstep2
--
--% Subsection fonts (13.15pt).
--\def\ssecnominalsize{13pt}
--\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1}
--\setfont\ssecit\itbshape{10}{1315}{OT1IT}
--\setfont\ssecsl\slbshape{10}{1315}{OT1}
--\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT}
--\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT}
--\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1}
--\let\ssecbf\ssecrm
--\setfont\ssecsc\scbshape{10}{1315}{OT1}
--\font\sseci=cmmi12 scaled \magstephalf
--\font\ssecsy=cmsy10 scaled 1315
--
--% Reduced fonts for @acro in text (10pt).
--\def\reducednominalsize{10pt}
--\setfont\reducedrm\rmshape{10}{1000}{OT1}
--\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
--\setfont\reducedbf\bfshape{10}{1000}{OT1}
--\setfont\reducedit\itshape{10}{1000}{OT1IT}
--\setfont\reducedsl\slshape{10}{1000}{OT1}
--\setfont\reducedsf\sfshape{10}{1000}{OT1}
--\setfont\reducedsc\scshape{10}{1000}{OT1}
--\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT}
--\font\reducedi=cmmi10
--\font\reducedsy=cmsy10
--
--% reset the current fonts
--\textfonts
--\rm
--} % end of 11pt text font size definitions
--
--
--% Definitions to make the main text be 10pt Computer Modern, with
--% section, chapter, etc., sizes following suit. This is for the GNU
--% Press printing of the Emacs 22 manual. Maybe other manuals in the
--% future. Used with @smallbook, which sets the leading to 12pt.
--%
--\def\definetextfontsizex{%
--% Text fonts (10pt).
--\def\textnominalsize{10pt}
--\edef\mainmagstep{1000}
--\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
--\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
--\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
--\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
--\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
--\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
--\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
--\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
--\font\texti=cmmi10 scaled \mainmagstep
--\font\textsy=cmsy10 scaled \mainmagstep
--
--% A few fonts for @defun names and args.
--\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
--\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
--\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
--\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
--
--% Fonts for indices, footnotes, small examples (9pt).
--\def\smallnominalsize{9pt}
--\setfont\smallrm\rmshape{9}{1000}{OT1}
--\setfont\smalltt\ttshape{9}{1000}{OT1TT}
--\setfont\smallbf\bfshape{10}{900}{OT1}
--\setfont\smallit\itshape{9}{1000}{OT1IT}
--\setfont\smallsl\slshape{9}{1000}{OT1}
--\setfont\smallsf\sfshape{9}{1000}{OT1}
--\setfont\smallsc\scshape{10}{900}{OT1}
--\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
--\font\smalli=cmmi9
--\font\smallsy=cmsy9
--
--% Fonts for small examples (8pt).
--\def\smallernominalsize{8pt}
--\setfont\smallerrm\rmshape{8}{1000}{OT1}
--\setfont\smallertt\ttshape{8}{1000}{OT1TT}
--\setfont\smallerbf\bfshape{10}{800}{OT1}
--\setfont\smallerit\itshape{8}{1000}{OT1IT}
--\setfont\smallersl\slshape{8}{1000}{OT1}
--\setfont\smallersf\sfshape{8}{1000}{OT1}
--\setfont\smallersc\scshape{10}{800}{OT1}
--\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
--\font\smalleri=cmmi8
--\font\smallersy=cmsy8
--
--% Fonts for title page (20.4pt):
--\def\titlenominalsize{20pt}
--\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
--\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
--\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
--\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
--\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
--\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
--\let\titlebf=\titlerm
--\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
--\font\titlei=cmmi12 scaled \magstep3
--\font\titlesy=cmsy10 scaled \magstep4
--\def\authorrm{\secrm}
--\def\authortt{\sectt}
--
--% Chapter fonts (14.4pt).
--\def\chapnominalsize{14pt}
--\setfont\chaprm\rmbshape{12}{\magstep1}{OT1}
--\setfont\chapit\itbshape{10}{\magstep2}{OT1IT}
--\setfont\chapsl\slbshape{10}{\magstep2}{OT1}
--\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT}
--\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT}
--\setfont\chapsf\sfbshape{12}{\magstep1}{OT1}
--\let\chapbf\chaprm
--\setfont\chapsc\scbshape{10}{\magstep2}{OT1}
--\font\chapi=cmmi12 scaled \magstep1
--\font\chapsy=cmsy10 scaled \magstep2
--
--% Section fonts (12pt).
--\def\secnominalsize{12pt}
--\setfont\secrm\rmbshape{12}{1000}{OT1}
--\setfont\secit\itbshape{10}{\magstep1}{OT1IT}
--\setfont\secsl\slbshape{10}{\magstep1}{OT1}
--\setfont\sectt\ttbshape{12}{1000}{OT1TT}
--\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT}
--\setfont\secsf\sfbshape{12}{1000}{OT1}
--\let\secbf\secrm
--\setfont\secsc\scbshape{10}{\magstep1}{OT1}
--\font\seci=cmmi12
--\font\secsy=cmsy10 scaled \magstep1
--
--% Subsection fonts (10pt).
--\def\ssecnominalsize{10pt}
--\setfont\ssecrm\rmbshape{10}{1000}{OT1}
--\setfont\ssecit\itbshape{10}{1000}{OT1IT}
--\setfont\ssecsl\slbshape{10}{1000}{OT1}
--\setfont\ssectt\ttbshape{10}{1000}{OT1TT}
--\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT}
--\setfont\ssecsf\sfbshape{10}{1000}{OT1}
--\let\ssecbf\ssecrm
--\setfont\ssecsc\scbshape{10}{1000}{OT1}
--\font\sseci=cmmi10
--\font\ssecsy=cmsy10
--
--% Reduced fonts for @acro in text (9pt).
--\def\reducednominalsize{9pt}
--\setfont\reducedrm\rmshape{9}{1000}{OT1}
--\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
--\setfont\reducedbf\bfshape{10}{900}{OT1}
--\setfont\reducedit\itshape{9}{1000}{OT1IT}
--\setfont\reducedsl\slshape{9}{1000}{OT1}
--\setfont\reducedsf\sfshape{9}{1000}{OT1}
--\setfont\reducedsc\scshape{10}{900}{OT1}
--\setfont\reducedttsl\ttslshape{10}{900}{OT1TT}
--\font\reducedi=cmmi9
--\font\reducedsy=cmsy9
--
--% reduce space between paragraphs
--\divide\parskip by 2
--
--% reset the current fonts
--\textfonts
--\rm
--} % end of 10pt text font size definitions
--
--
--% We provide the user-level command
--% @fonttextsize 10
--% (or 11) to redefine the text font size. pt is assumed.
--%
--\def\xword{10}
--\def\xiword{11}
--%
--\parseargdef\fonttextsize{%
-- \def\textsizearg{#1}%
-- \wlog{doing @fonttextsize \textsizearg}%
-- %
-- % Set \globaldefs so that documents can use this inside @tex, since
-- % makeinfo 4.8 does not support it, but we need it nonetheless.
-- %
-- \begingroup \globaldefs=1
-- \ifx\textsizearg\xword \definetextfontsizex
-- \else \ifx\textsizearg\xiword \definetextfontsizexi
-- \else
-- \errhelp=\EMsimple
-- \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
-- \fi\fi
-- \endgroup
--}
--
--
--% In order for the font changes to affect most math symbols and letters,
--% we have to define the \textfont of the standard families. Since
--% texinfo doesn't allow for producing subscripts and superscripts except
--% in the main text, we don't bother to reset \scriptfont and
--% \scriptscriptfont (which would also require loading a lot more fonts).
--%
--\def\resetmathfonts{%
-- \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy
-- \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf
-- \textfont\ttfam=\tentt \textfont\sffam=\tensf
--}
--
--% The font-changing commands redefine the meanings of \tenSTYLE, instead
--% of just \STYLE. We do this because \STYLE needs to also set the
--% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire
--% \tenSTYLE to set the current font.
--%
--% Each font-changing command also sets the names \lsize (one size lower)
--% and \lllsize (three sizes lower). These relative commands are used in
--% the LaTeX logo and acronyms.
--%
--% This all needs generalizing, badly.
--%
--\def\textfonts{%
-- \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
-- \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
-- \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
-- \let\tenttsl=\textttsl
-- \def\curfontsize{text}%
-- \def\lsize{reduced}\def\lllsize{smaller}%
-- \resetmathfonts \setleading{\textleading}}
--\def\titlefonts{%
-- \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
-- \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
-- \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
-- \let\tenttsl=\titlettsl
-- \def\curfontsize{title}%
-- \def\lsize{chap}\def\lllsize{subsec}%
-- \resetmathfonts \setleading{25pt}}
--\def\titlefont#1{{\titlefonts\rm #1}}
--\def\chapfonts{%
-- \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
-- \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
-- \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
-- \let\tenttsl=\chapttsl
-- \def\curfontsize{chap}%
-- \def\lsize{sec}\def\lllsize{text}%
-- \resetmathfonts \setleading{19pt}}
--\def\secfonts{%
-- \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
-- \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
-- \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
-- \let\tenttsl=\secttsl
-- \def\curfontsize{sec}%
-- \def\lsize{subsec}\def\lllsize{reduced}%
-- \resetmathfonts \setleading{16pt}}
--\def\subsecfonts{%
-- \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
-- \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
-- \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
-- \let\tenttsl=\ssecttsl
-- \def\curfontsize{ssec}%
-- \def\lsize{text}\def\lllsize{small}%
-- \resetmathfonts \setleading{15pt}}
--\let\subsubsecfonts = \subsecfonts
--\def\reducedfonts{%
-- \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl
-- \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
-- \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
-- \let\tenttsl=\reducedttsl
-- \def\curfontsize{reduced}%
-- \def\lsize{small}\def\lllsize{smaller}%
-- \resetmathfonts \setleading{10.5pt}}
--\def\smallfonts{%
-- \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
-- \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
-- \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
-- \let\tenttsl=\smallttsl
-- \def\curfontsize{small}%
-- \def\lsize{smaller}\def\lllsize{smaller}%
-- \resetmathfonts \setleading{10.5pt}}
--\def\smallerfonts{%
-- \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
-- \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
-- \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
-- \let\tenttsl=\smallerttsl
-- \def\curfontsize{smaller}%
-- \def\lsize{smaller}\def\lllsize{smaller}%
-- \resetmathfonts \setleading{9.5pt}}
--
--% Set the fonts to use with the @small... environments.
--\let\smallexamplefonts = \smallfonts
--
--% About \smallexamplefonts. If we use \smallfonts (9pt), @smallexample
--% can fit this many characters:
--% 8.5x11=86 smallbook=72 a4=90 a5=69
--% If we use \scriptfonts (8pt), then we can fit this many characters:
--% 8.5x11=90+ smallbook=80 a4=90+ a5=77
--% For me, subjectively, the few extra characters that fit aren't worth
--% the additional smallness of 8pt. So I'm making the default 9pt.
--%
--% By the way, for comparison, here's what fits with @example (10pt):
--% 8.5x11=71 smallbook=60 a4=75 a5=58
--%
--% I wish the USA used A4 paper.
--% --karl, 24jan03.
--
--
--% Set up the default fonts, so we can use them for creating boxes.
--%
--\definetextfontsizexi
--
--% Define these so they can be easily changed for other fonts.
--\def\angleleft{$\langle$}
--\def\angleright{$\rangle$}
--
--% Count depth in font-changes, for error checks
--\newcount\fontdepth \fontdepth=0
--
--% Fonts for short table of contents.
--\setfont\shortcontrm\rmshape{12}{1000}{OT1}
--\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
--\setfont\shortcontsl\slshape{12}{1000}{OT1}
--\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
--
--%% Add scribe-like font environments, plus @l for inline lisp (usually sans
--%% serif) and @ii for TeX italic
--
--% \smartitalic{ARG} outputs arg in italics, followed by an italic correction
--% unless the following character is such as not to need one.
--\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
-- \ptexslash\fi\fi\fi}
--\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
--\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
--
--% like \smartslanted except unconditionally uses \ttsl.
--% @var is set to this for defun arguments.
--\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
--
--% like \smartslanted except unconditionally use \sl. We never want
--% ttsl for book titles, do we?
--\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
--
--\let\i=\smartitalic
--\let\slanted=\smartslanted
--\let\var=\smartslanted
--\let\dfn=\smartslanted
--\let\emph=\smartitalic
--
--% @b, explicit bold.
--\def\b#1{{\bf #1}}
--\let\strong=\b
--
--% @sansserif, explicit sans.
--\def\sansserif#1{{\sf #1}}
--
--% We can't just use \exhyphenpenalty, because that only has effect at
--% the end of a paragraph. Restore normal hyphenation at the end of the
--% group within which \nohyphenation is presumably called.
--%
--\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation}
--\def\restorehyphenation{\hyphenchar\font = `- }
--
--% Set sfcode to normal for the chars that usually have another value.
--% Can't use plain's \frenchspacing because it uses the `\x notation, and
--% sometimes \x has an active definition that messes things up.
--%
--\catcode`@=11
-- \def\plainfrenchspacing{%
-- \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
-- \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
-- \def\endofsentencespacefactor{1000}% for @. and friends
-- }
-- \def\plainnonfrenchspacing{%
-- \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
-- \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
-- \def\endofsentencespacefactor{3000}% for @. and friends
-- }
--\catcode`@=\other
--\def\endofsentencespacefactor{3000}% default
--
--\def\t#1{%
-- {\tt \rawbackslash \plainfrenchspacing #1}%
-- \null
--}
--\def\samp#1{`\tclose{#1}'\null}
--\setfont\keyrm\rmshape{8}{1000}{OT1}
--\font\keysy=cmsy9
--\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
-- \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
-- \vbox{\hrule\kern-0.4pt
-- \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
-- \kern-0.4pt\hrule}%
-- \kern-.06em\raise0.4pt\hbox{\angleright}}}}
--\def\key #1{{\nohyphenation \uppercase{#1}}\null}
--% The old definition, with no lozenge:
--%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
--\def\ctrl #1{{\tt \rawbackslash \hat}#1}
--
--% @file, @option are the same as @samp.
--\let\file=\samp
--\let\option=\samp
--
--% @code is a modification of @t,
--% which makes spaces the same size as normal in the surrounding text.
--\def\tclose#1{%
-- {%
-- % Change normal interword space to be same as for the current font.
-- \spaceskip = \fontdimen2\font
-- %
-- % Switch to typewriter.
-- \tt
-- %
-- % But `\ ' produces the large typewriter interword space.
-- \def\ {{\spaceskip = 0pt{} }}%
-- %
-- % Turn off hyphenation.
-- \nohyphenation
-- %
-- \rawbackslash
-- \plainfrenchspacing
-- #1%
-- }%
-- \null
--}
--
--% We *must* turn on hyphenation at `-' and `_' in @code.
--% Otherwise, it is too hard to avoid overfull hboxes
--% in the Emacs manual, the Library manual, etc.
--
--% Unfortunately, TeX uses one parameter (\hyphenchar) to control
--% both hyphenation at - and hyphenation within words.
--% We must therefore turn them both off (\tclose does that)
--% and arrange explicitly to hyphenate at a dash.
--% -- rms.
--{
-- \catcode`\-=\active \catcode`\_=\active
-- \catcode`\'=\active \catcode`\`=\active
-- %
-- \global\def\code{\begingroup
-- \catcode\rquoteChar=\active \catcode\lquoteChar=\active
-- \let'\codequoteright \let`\codequoteleft
-- %
-- \catcode\dashChar=\active \catcode\underChar=\active
-- \ifallowcodebreaks
-- \let-\codedash
-- \let_\codeunder
-- \else
-- \let-\realdash
-- \let_\realunder
-- \fi
-- \codex
-- }
--}
--
--\def\realdash{-}
--\def\codedash{-\discretionary{}{}{}}
--\def\codeunder{%
-- % this is all so @math{@code{var_name}+1} can work. In math mode, _
-- % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
-- % will therefore expand the active definition of _, which is us
-- % (inside @code that is), therefore an endless loop.
-- \ifusingtt{\ifmmode
-- \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_.
-- \else\normalunderscore \fi
-- \discretionary{}{}{}}%
-- {\_}%
--}
--\def\codex #1{\tclose{#1}\endgroup}
--
--% An additional complication: the above will allow breaks after, e.g.,
--% each of the four underscores in __typeof__. This is undesirable in
--% some manuals, especially if they don't have long identifiers in
--% general. @allowcodebreaks provides a way to control this.
--%
--\newif\ifallowcodebreaks \allowcodebreakstrue
--
--\def\keywordtrue{true}
--\def\keywordfalse{false}
--
--\parseargdef\allowcodebreaks{%
-- \def\txiarg{#1}%
-- \ifx\txiarg\keywordtrue
-- \allowcodebreakstrue
-- \else\ifx\txiarg\keywordfalse
-- \allowcodebreaksfalse
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
-- \fi\fi
--}
--
--% @kbd is like @code, except that if the argument is just one @key command,
--% then @kbd has no effect.
--
--% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
--% `example' (@kbd uses ttsl only inside of @example and friends),
--% or `code' (@kbd uses normal tty font always).
--\parseargdef\kbdinputstyle{%
-- \def\txiarg{#1}%
-- \ifx\txiarg\worddistinct
-- \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-- \else\ifx\txiarg\wordexample
-- \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-- \else\ifx\txiarg\wordcode
-- \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
-- \fi\fi\fi
--}
--\def\worddistinct{distinct}
--\def\wordexample{example}
--\def\wordcode{code}
--
--% Default is `distinct.'
--\kbdinputstyle distinct
--
--\def\xkey{\key}
--\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
--\ifx\one\xkey\ifx\threex\three \key{#2}%
--\else{\tclose{\kbdfont\look}}\fi
--\else{\tclose{\kbdfont\look}}\fi}
--
--% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
--\let\indicateurl=\code
--\let\env=\code
--\let\command=\code
--
--% @uref (abbreviation for `urlref') takes an optional (comma-separated)
--% second argument specifying the text to display and an optional third
--% arg as text to display instead of (rather than in addition to) the url
--% itself. First (mandatory) arg is the url. Perhaps eventually put in
--% a hypertex \special here.
--%
--\def\uref#1{\douref #1,,,\finish}
--\def\douref#1,#2,#3,#4\finish{\begingroup
-- \unsepspaces
-- \pdfurl{#1}%
-- \setbox0 = \hbox{\ignorespaces #3}%
-- \ifdim\wd0 > 0pt
-- \unhbox0 % third arg given, show only that
-- \else
-- \setbox0 = \hbox{\ignorespaces #2}%
-- \ifdim\wd0 > 0pt
-- \ifpdf
-- \unhbox0 % PDF: 2nd arg given, show only it
-- \else
-- \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
-- \fi
-- \else
-- \code{#1}% only url given, so show it
-- \fi
-- \fi
-- \endlink
--\endgroup}
--
--% @url synonym for @uref, since that's how everyone uses it.
--%
--\let\url=\uref
--
--% rms does not like angle brackets --karl, 17may97.
--% So now @email is just like @uref, unless we are pdf.
--%
--%\def\email#1{\angleleft{\tt #1}\angleright}
--\ifpdf
-- \def\email#1{\doemail#1,,\finish}
-- \def\doemail#1,#2,#3\finish{\begingroup
-- \unsepspaces
-- \pdfurl{mailto:#1}%
-- \setbox0 = \hbox{\ignorespaces #2}%
-- \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
-- \endlink
-- \endgroup}
--\else
-- \let\email=\uref
--\fi
--
--% Check if we are currently using a typewriter font. Since all the
--% Computer Modern typewriter fonts have zero interword stretch (and
--% shrink), and it is reasonable to expect all typewriter fonts to have
--% this property, we can check that font parameter.
--%
--\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
--
--% Typeset a dimension, e.g., `in' or `pt'. The only reason for the
--% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
--%
--\def\dmn#1{\thinspace #1}
--
--\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par}
--
--% @l was never documented to mean ``switch to the Lisp font'',
--% and it is not used as such in any manual I can find. We need it for
--% Polish suppressed-l. --karl, 22sep96.
--%\def\l#1{{\li #1}\null}
--
--% Explicit font changes: @r, @sc, undocumented @ii.
--\def\r#1{{\rm #1}} % roman font
--\def\sc#1{{\smallcaps#1}} % smallcaps font
--\def\ii#1{{\it #1}} % italic font
--
--% @acronym for "FBI", "NATO", and the like.
--% We print this one point size smaller, since it's intended for
--% all-uppercase.
--%
--\def\acronym#1{\doacronym #1,,\finish}
--\def\doacronym#1,#2,#3\finish{%
-- {\selectfonts\lsize #1}%
-- \def\temp{#2}%
-- \ifx\temp\empty \else
-- \space ({\unsepspaces \ignorespaces \temp \unskip})%
-- \fi
--}
--
--% @abbr for "Comput. J." and the like.
--% No font change, but don't do end-of-sentence spacing.
--%
--\def\abbr#1{\doabbr #1,,\finish}
--\def\doabbr#1,#2,#3\finish{%
-- {\plainfrenchspacing #1}%
-- \def\temp{#2}%
-- \ifx\temp\empty \else
-- \space ({\unsepspaces \ignorespaces \temp \unskip})%
-- \fi
--}
--
--% @pounds{} is a sterling sign, which Knuth put in the CM italic font.
--%
--\def\pounds{{\it\$}}
--
--% @euro{} comes from a separate font, depending on the current style.
--% We use the free feym* fonts from the eurosym package by Henrik
--% Theiling, which support regular, slanted, bold and bold slanted (and
--% "outlined" (blackboard board, sort of) versions, which we don't need).
--% It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
--%
--% Although only regular is the truly official Euro symbol, we ignore
--% that. The Euro is designed to be slightly taller than the regular
--% font height.
--%
--% feymr - regular
--% feymo - slanted
--% feybr - bold
--% feybo - bold slanted
--%
--% There is no good (free) typewriter version, to my knowledge.
--% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
--% Hmm.
--%
--% Also doesn't work in math. Do we need to do math with euro symbols?
--% Hope not.
--%
--%
--\def\euro{{\eurofont e}}
--\def\eurofont{%
-- % We set the font at each command, rather than predefining it in
-- % \textfonts and the other font-switching commands, so that
-- % installations which never need the symbol don't have to have the
-- % font installed.
-- %
-- % There is only one designed size (nominal 10pt), so we always scale
-- % that to the current nominal size.
-- %
-- % By the way, simply using "at 1em" works for cmr10 and the like, but
-- % does not work for cmbx10 and other extended/shrunken fonts.
-- %
-- \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
-- %
-- \ifx\curfontstyle\bfstylename
-- % bold:
-- \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
-- \else
-- % regular:
-- \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
-- \fi
-- \thiseurofont
--}
--
--% @registeredsymbol - R in a circle. The font for the R should really
--% be smaller yet, but lllsize is the best we can do for now.
--% Adapted from the plain.tex definition of \copyright.
--%
--\def\registeredsymbol{%
-- $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}%
-- \hfil\crcr\Orb}}%
-- }$%
--}
--
--% @textdegree - the normal degrees sign.
--%
--\def\textdegree{$^\circ$}
--
--% Laurent Siebenmann reports \Orb undefined with:
--% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38
--% so we'll define it if necessary.
--%
--\ifx\Orb\undefined
--\def\Orb{\mathhexbox20D}
--\fi
--
--
--\message{page headings,}
--
--\newskip\titlepagetopglue \titlepagetopglue = 1.5in
--\newskip\titlepagebottomglue \titlepagebottomglue = 2pc
--
--% First the title page. Must do @settitle before @titlepage.
--\newif\ifseenauthor
--\newif\iffinishedtitlepage
--
--% Do an implicit @contents or @shortcontents after @end titlepage if the
--% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
--%
--\newif\ifsetcontentsaftertitlepage
-- \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
--\newif\ifsetshortcontentsaftertitlepage
-- \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
--
--\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
-- \endgroup\page\hbox{}\page}
--
--\envdef\titlepage{%
-- % Open one extra group, as we want to close it in the middle of \Etitlepage.
-- \begingroup
-- \parindent=0pt \textfonts
-- % Leave some space at the very top of the page.
-- \vglue\titlepagetopglue
-- % No rule at page bottom unless we print one at the top with @title.
-- \finishedtitlepagetrue
-- %
-- % Most title ``pages'' are actually two pages long, with space
-- % at the top of the second. We don't want the ragged left on the second.
-- \let\oldpage = \page
-- \def\page{%
-- \iffinishedtitlepage\else
-- \finishtitlepage
-- \fi
-- \let\page = \oldpage
-- \page
-- \null
-- }%
--}
--
--\def\Etitlepage{%
-- \iffinishedtitlepage\else
-- \finishtitlepage
-- \fi
-- % It is important to do the page break before ending the group,
-- % because the headline and footline are only empty inside the group.
-- % If we use the new definition of \page, we always get a blank page
-- % after the title page, which we certainly don't want.
-- \oldpage
-- \endgroup
-- %
-- % Need this before the \...aftertitlepage checks so that if they are
-- % in effect the toc pages will come out with page numbers.
-- \HEADINGSon
-- %
-- % If they want short, they certainly want long too.
-- \ifsetshortcontentsaftertitlepage
-- \shortcontents
-- \contents
-- \global\let\shortcontents = \relax
-- \global\let\contents = \relax
-- \fi
-- %
-- \ifsetcontentsaftertitlepage
-- \contents
-- \global\let\contents = \relax
-- \global\let\shortcontents = \relax
-- \fi
--}
--
--\def\finishtitlepage{%
-- \vskip4pt \hrule height 2pt width \hsize
-- \vskip\titlepagebottomglue
-- \finishedtitlepagetrue
--}
--
--%%% Macros to be used within @titlepage:
--
--\let\subtitlerm=\tenrm
--\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
--
--\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
-- \let\tt=\authortt}
--
--\parseargdef\title{%
-- \checkenv\titlepage
-- \leftline{\titlefonts\rm #1}
-- % print a rule at the page bottom also.
-- \finishedtitlepagefalse
-- \vskip4pt \hrule height 4pt width \hsize \vskip4pt
--}
--
--\parseargdef\subtitle{%
-- \checkenv\titlepage
-- {\subtitlefont \rightline{#1}}%
--}
--
--% @author should come last, but may come many times.
--% It can also be used inside @quotation.
--%
--\parseargdef\author{%
-- \def\temp{\quotation}%
-- \ifx\thisenv\temp
-- \def\quotationauthor{#1}% printed in \Equotation.
-- \else
-- \checkenv\titlepage
-- \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
-- {\authorfont \leftline{#1}}%
-- \fi
--}
--
--
--%%% Set up page headings and footings.
--
--\let\thispage=\folio
--
--\newtoks\evenheadline % headline on even pages
--\newtoks\oddheadline % headline on odd pages
--\newtoks\evenfootline % footline on even pages
--\newtoks\oddfootline % footline on odd pages
--
--% Now make TeX use those variables
--\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
-- \else \the\evenheadline \fi}}
--\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
-- \else \the\evenfootline \fi}\HEADINGShook}
--\let\HEADINGShook=\relax
--
--% Commands to set those variables.
--% For example, this is what @headings on does
--% @evenheading @thistitle|@thispage|@thischapter
--% @oddheading @thischapter|@thispage|@thistitle
--% @evenfooting @thisfile||
--% @oddfooting ||@thisfile
--
--
--\def\evenheading{\parsearg\evenheadingxxx}
--\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish}
--\def\evenheadingyyy #1\|#2\|#3\|#4\finish{%
--\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
--
--\def\oddheading{\parsearg\oddheadingxxx}
--\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish}
--\def\oddheadingyyy #1\|#2\|#3\|#4\finish{%
--\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
--
--\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
--
--\def\evenfooting{\parsearg\evenfootingxxx}
--\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish}
--\def\evenfootingyyy #1\|#2\|#3\|#4\finish{%
--\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
--
--\def\oddfooting{\parsearg\oddfootingxxx}
--\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish}
--\def\oddfootingyyy #1\|#2\|#3\|#4\finish{%
-- \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
-- %
-- % Leave some space for the footline. Hopefully ok to assume
-- % @evenfooting will not be used by itself.
-- \global\advance\pageheight by -12pt
-- \global\advance\vsize by -12pt
--}
--
--\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
--
--
--% @headings double turns headings on for double-sided printing.
--% @headings single turns headings on for single-sided printing.
--% @headings off turns them off.
--% @headings on same as @headings double, retained for compatibility.
--% @headings after turns on double-sided headings after this page.
--% @headings doubleafter turns on double-sided headings after this page.
--% @headings singleafter turns on single-sided headings after this page.
--% By default, they are off at the start of a document,
--% and turned `on' after @end titlepage.
--
--\def\headings #1 {\csname HEADINGS#1\endcsname}
--
--\def\HEADINGSoff{%
--\global\evenheadline={\hfil} \global\evenfootline={\hfil}
--\global\oddheadline={\hfil} \global\oddfootline={\hfil}}
--\HEADINGSoff
--% When we turn headings on, set the page number to 1.
--% For double-sided printing, put current file name in lower left corner,
--% chapter name on inside top of right hand pages, document
--% title on inside top of left hand pages, and page numbers on outside top
--% edge of all pages.
--\def\HEADINGSdouble{%
--\global\pageno=1
--\global\evenfootline={\hfil}
--\global\oddfootline={\hfil}
--\global\evenheadline={\line{\folio\hfil\thistitle}}
--\global\oddheadline={\line{\thischapter\hfil\folio}}
--\global\let\contentsalignmacro = \chapoddpage
--}
--\let\contentsalignmacro = \chappager
--
--% For single-sided printing, chapter title goes across top left of page,
--% page number on top right.
--\def\HEADINGSsingle{%
--\global\pageno=1
--\global\evenfootline={\hfil}
--\global\oddfootline={\hfil}
--\global\evenheadline={\line{\thischapter\hfil\folio}}
--\global\oddheadline={\line{\thischapter\hfil\folio}}
--\global\let\contentsalignmacro = \chappager
--}
--\def\HEADINGSon{\HEADINGSdouble}
--
--\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex}
--\let\HEADINGSdoubleafter=\HEADINGSafter
--\def\HEADINGSdoublex{%
--\global\evenfootline={\hfil}
--\global\oddfootline={\hfil}
--\global\evenheadline={\line{\folio\hfil\thistitle}}
--\global\oddheadline={\line{\thischapter\hfil\folio}}
--\global\let\contentsalignmacro = \chapoddpage
--}
--
--\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
--\def\HEADINGSsinglex{%
--\global\evenfootline={\hfil}
--\global\oddfootline={\hfil}
--\global\evenheadline={\line{\thischapter\hfil\folio}}
--\global\oddheadline={\line{\thischapter\hfil\folio}}
--\global\let\contentsalignmacro = \chappager
--}
--
--% Subroutines used in generating headings
--% This produces Day Month Year style of output.
--% Only define if not already defined, in case a txi-??.tex file has set
--% up a different format (e.g., txi-cs.tex does this).
--\ifx\today\undefined
--\def\today{%
-- \number\day\space
-- \ifcase\month
-- \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
-- \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
-- \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
-- \fi
-- \space\number\year}
--\fi
--
--% @settitle line... specifies the title of the document, for headings.
--% It generates no output of its own.
--\def\thistitle{\putwordNoTitle}
--\def\settitle{\parsearg{\gdef\thistitle}}
--
--
--\message{tables,}
--% Tables -- @table, @ftable, @vtable, @item(x).
--
--% default indentation of table text
--\newdimen\tableindent \tableindent=.8in
--% default indentation of @itemize and @enumerate text
--\newdimen\itemindent \itemindent=.3in
--% margin between end of table item and start of table text.
--\newdimen\itemmargin \itemmargin=.1in
--
--% used internally for \itemindent minus \itemmargin
--\newdimen\itemmax
--
--% Note @table, @ftable, and @vtable define @item, @itemx, etc., with
--% these defs.
--% They also define \itemindex
--% to index the item name in whatever manner is desired (perhaps none).
--
--\newif\ifitemxneedsnegativevskip
--
--\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi}
--
--\def\internalBitem{\smallbreak \parsearg\itemzzz}
--\def\internalBitemx{\itemxpar \parsearg\itemzzz}
--
--\def\itemzzz #1{\begingroup %
-- \advance\hsize by -\rightskip
-- \advance\hsize by -\tableindent
-- \setbox0=\hbox{\itemindicate{#1}}%
-- \itemindex{#1}%
-- \nobreak % This prevents a break before @itemx.
-- %
-- % If the item text does not fit in the space we have, put it on a line
-- % by itself, and do not allow a page break either before or after that
-- % line. We do not start a paragraph here because then if the next
-- % command is, e.g., @kindex, the whatsit would get put into the
-- % horizontal list on a line by itself, resulting in extra blank space.
-- \ifdim \wd0>\itemmax
-- %
-- % Make this a paragraph so we get the \parskip glue and wrapping,
-- % but leave it ragged-right.
-- \begingroup
-- \advance\leftskip by-\tableindent
-- \advance\hsize by\tableindent
-- \advance\rightskip by0pt plus1fil
-- \leavevmode\unhbox0\par
-- \endgroup
-- %
-- % We're going to be starting a paragraph, but we don't want the
-- % \parskip glue -- logically it's part of the @item we just started.
-- \nobreak \vskip-\parskip
-- %
-- % Stop a page break at the \parskip glue coming up. However, if
-- % what follows is an environment such as @example, there will be no
-- % \parskip glue; then the negative vskip we just inserted would
-- % cause the example and the item to crash together. So we use this
-- % bizarre value of 10001 as a signal to \aboveenvbreak to insert
-- % \parskip glue after all. Section titles are handled this way also.
-- %
-- \penalty 10001
-- \endgroup
-- \itemxneedsnegativevskipfalse
-- \else
-- % The item text fits into the space. Start a paragraph, so that the
-- % following text (if any) will end up on the same line.
-- \noindent
-- % Do this with kerns and \unhbox so that if there is a footnote in
-- % the item text, it can migrate to the main vertical list and
-- % eventually be printed.
-- \nobreak\kern-\tableindent
-- \dimen0 = \itemmax \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0
-- \unhbox0
-- \nobreak\kern\dimen0
-- \endgroup
-- \itemxneedsnegativevskiptrue
-- \fi
--}
--
--\def\item{\errmessage{@item while not in a list environment}}
--\def\itemx{\errmessage{@itemx while not in a list environment}}
--
--% @table, @ftable, @vtable.
--\envdef\table{%
-- \let\itemindex\gobble
-- \tablecheck{table}%
--}
--\envdef\ftable{%
-- \def\itemindex ##1{\doind {fn}{\code{##1}}}%
-- \tablecheck{ftable}%
--}
--\envdef\vtable{%
-- \def\itemindex ##1{\doind {vr}{\code{##1}}}%
-- \tablecheck{vtable}%
--}
--\def\tablecheck#1{%
-- \ifnum \the\catcode`\^^M=\active
-- \endgroup
-- \errmessage{This command won't work in this context; perhaps the problem is
-- that we are \inenvironment\thisenv}%
-- \def\next{\doignore{#1}}%
-- \else
-- \let\next\tablex
-- \fi
-- \next
--}
--\def\tablex#1{%
-- \def\itemindicate{#1}%
-- \parsearg\tabley
--}
--\def\tabley#1{%
-- {%
-- \makevalueexpandable
-- \edef\temp{\noexpand\tablez #1\space\space\space}%
-- \expandafter
-- }\temp \endtablez
--}
--\def\tablez #1 #2 #3 #4\endtablez{%
-- \aboveenvbreak
-- \ifnum 0#1>0 \advance \leftskip by #1\mil \fi
-- \ifnum 0#2>0 \tableindent=#2\mil \fi
-- \ifnum 0#3>0 \advance \rightskip by #3\mil \fi
-- \itemmax=\tableindent
-- \advance \itemmax by -\itemmargin
-- \advance \leftskip by \tableindent
-- \exdentamount=\tableindent
-- \parindent = 0pt
-- \parskip = \smallskipamount
-- \ifdim \parskip=0pt \parskip=2pt \fi
-- \let\item = \internalBitem
-- \let\itemx = \internalBitemx
--}
--\def\Etable{\endgraf\afterenvbreak}
--\let\Eftable\Etable
--\let\Evtable\Etable
--\let\Eitemize\Etable
--\let\Eenumerate\Etable
--
--% This is the counter used by @enumerate, which is really @itemize
--
--\newcount \itemno
--
--\envdef\itemize{\parsearg\doitemize}
--
--\def\doitemize#1{%
-- \aboveenvbreak
-- \itemmax=\itemindent
-- \advance\itemmax by -\itemmargin
-- \advance\leftskip by \itemindent
-- \exdentamount=\itemindent
-- \parindent=0pt
-- \parskip=\smallskipamount
-- \ifdim\parskip=0pt \parskip=2pt \fi
-- \def\itemcontents{#1}%
-- % @itemize with no arg is equivalent to @itemize @bullet.
-- \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
-- \let\item=\itemizeitem
--}
--
--% Definition of @item while inside @itemize and @enumerate.
--%
--\def\itemizeitem{%
-- \advance\itemno by 1 % for enumerations
-- {\let\par=\endgraf \smallbreak}% reasonable place to break
-- {%
-- % If the document has an @itemize directly after a section title, a
-- % \nobreak will be last on the list, and \sectionheading will have
-- % done a \vskip-\parskip. In that case, we don't want to zero
-- % parskip, or the item text will crash with the heading. On the
-- % other hand, when there is normal text preceding the item (as there
-- % usually is), we do want to zero parskip, or there would be too much
-- % space. In that case, we won't have a \nobreak before. At least
-- % that's the theory.
-- \ifnum\lastpenalty<10000 \parskip=0in \fi
-- \noindent
-- \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
-- \vadjust{\penalty 1200}}% not good to break after first line of item.
-- \flushcr
--}
--
--% \splitoff TOKENS\endmark defines \first to be the first token in
--% TOKENS, and \rest to be the remainder.
--%
--\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}%
--
--% Allow an optional argument of an uppercase letter, lowercase letter,
--% or number, to specify the first label in the enumerated list. No
--% argument is the same as `1'.
--%
--\envparseargdef\enumerate{\enumeratey #1 \endenumeratey}
--\def\enumeratey #1 #2\endenumeratey{%
-- % If we were given no argument, pretend we were given `1'.
-- \def\thearg{#1}%
-- \ifx\thearg\empty \def\thearg{1}\fi
-- %
-- % Detect if the argument is a single token. If so, it might be a
-- % letter. Otherwise, the only valid thing it can be is a number.
-- % (We will always have one token, because of the test we just made.
-- % This is a good thing, since \splitoff doesn't work given nothing at
-- % all -- the first parameter is undelimited.)
-- \expandafter\splitoff\thearg\endmark
-- \ifx\rest\empty
-- % Only one token in the argument. It could still be anything.
-- % A ``lowercase letter'' is one whose \lccode is nonzero.
-- % An ``uppercase letter'' is one whose \lccode is both nonzero, and
-- % not equal to itself.
-- % Otherwise, we assume it's a number.
-- %
-- % We need the \relax at the end of the \ifnum lines to stop TeX from
-- % continuing to look for a <number>.
-- %
-- \ifnum\lccode\expandafter`\thearg=0\relax
-- \numericenumerate % a number (we hope)
-- \else
-- % It's a letter.
-- \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax
-- \lowercaseenumerate % lowercase letter
-- \else
-- \uppercaseenumerate % uppercase letter
-- \fi
-- \fi
-- \else
-- % Multiple tokens in the argument. We hope it's a number.
-- \numericenumerate
-- \fi
--}
--
--% An @enumerate whose labels are integers. The starting integer is
--% given in \thearg.
--%
--\def\numericenumerate{%
-- \itemno = \thearg
-- \startenumeration{\the\itemno}%
--}
--
--% The starting (lowercase) letter is in \thearg.
--\def\lowercaseenumerate{%
-- \itemno = \expandafter`\thearg
-- \startenumeration{%
-- % Be sure we're not beyond the end of the alphabet.
-- \ifnum\itemno=0
-- \errmessage{No more lowercase letters in @enumerate; get a bigger
-- alphabet}%
-- \fi
-- \char\lccode\itemno
-- }%
--}
--
--% The starting (uppercase) letter is in \thearg.
--\def\uppercaseenumerate{%
-- \itemno = \expandafter`\thearg
-- \startenumeration{%
-- % Be sure we're not beyond the end of the alphabet.
-- \ifnum\itemno=0
-- \errmessage{No more uppercase letters in @enumerate; get a bigger
-- alphabet}
-- \fi
-- \char\uccode\itemno
-- }%
--}
--
--% Call \doitemize, adding a period to the first argument and supplying the
--% common last two arguments. Also subtract one from the initial value in
--% \itemno, since @item increments \itemno.
--%
--\def\startenumeration#1{%
-- \advance\itemno by -1
-- \doitemize{#1.}\flushcr
--}
--
--% @alphaenumerate and @capsenumerate are abbreviations for giving an arg
--% to @enumerate.
--%
--\def\alphaenumerate{\enumerate{a}}
--\def\capsenumerate{\enumerate{A}}
--\def\Ealphaenumerate{\Eenumerate}
--\def\Ecapsenumerate{\Eenumerate}
--
--
--% @multitable macros
--% Amy Hendrickson, 8/18/94, 3/6/96
--%
--% @multitable ... @end multitable will make as many columns as desired.
--% Contents of each column will wrap at width given in preamble. Width
--% can be specified either with sample text given in a template line,
--% or in percent of \hsize, the current width of text on page.
--
--% Table can continue over pages but will only break between lines.
--
--% To make preamble:
--%
--% Either define widths of columns in terms of percent of \hsize:
--% @multitable @columnfractions .25 .3 .45
--% @item ...
--%
--% Numbers following @columnfractions are the percent of the total
--% current hsize to be used for each column. You may use as many
--% columns as desired.
--
--
--% Or use a template:
--% @multitable {Column 1 template} {Column 2 template} {Column 3 template}
--% @item ...
--% using the widest term desired in each column.
--
--% Each new table line starts with @item, each subsequent new column
--% starts with @tab. Empty columns may be produced by supplying @tab's
--% with nothing between them for as many times as empty columns are needed,
--% ie, @tab at tab@tab will produce two empty columns.
--
--% @item, @tab do not need to be on their own lines, but it will not hurt
--% if they are.
--
--% Sample multitable:
--
--% @multitable {Column 1 template} {Column 2 template} {Column 3 template}
--% @item first col stuff @tab second col stuff @tab third col
--% @item
--% first col stuff
--% @tab
--% second col stuff
--% @tab
--% third col
--% @item first col stuff @tab second col stuff
--% @tab Many paragraphs of text may be used in any column.
--%
--% They will wrap at the width determined by the template.
--% @item at tab@tab This will be in third column.
--% @end multitable
--
--% Default dimensions may be reset by user.
--% @multitableparskip is vertical space between paragraphs in table.
--% @multitableparindent is paragraph indent in table.
--% @multitablecolmargin is horizontal space to be left between columns.
--% @multitablelinespace is space to leave between table items, baseline
--% to baseline.
--% 0pt means it depends on current normal line spacing.
--%
--\newskip\multitableparskip
--\newskip\multitableparindent
--\newdimen\multitablecolspace
--\newskip\multitablelinespace
--\multitableparskip=0pt
--\multitableparindent=6pt
--\multitablecolspace=12pt
--\multitablelinespace=0pt
--
--% Macros used to set up halign preamble:
--%
--\let\endsetuptable\relax
--\def\xendsetuptable{\endsetuptable}
--\let\columnfractions\relax
--\def\xcolumnfractions{\columnfractions}
--\newif\ifsetpercent
--
--% #1 is the @columnfraction, usually a decimal number like .5, but might
--% be just 1. We just use it, whatever it is.
--%
--\def\pickupwholefraction#1 {%
-- \global\advance\colcount by 1
-- \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}%
-- \setuptable
--}
--
--\newcount\colcount
--\def\setuptable#1{%
-- \def\firstarg{#1}%
-- \ifx\firstarg\xendsetuptable
-- \let\go = \relax
-- \else
-- \ifx\firstarg\xcolumnfractions
-- \global\setpercenttrue
-- \else
-- \ifsetpercent
-- \let\go\pickupwholefraction
-- \else
-- \global\advance\colcount by 1
-- \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
-- % separator; typically that is always in the input, anyway.
-- \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
-- \fi
-- \fi
-- \ifx\go\pickupwholefraction
-- % Put the argument back for the \pickupwholefraction call, so
-- % we'll always have a period there to be parsed.
-- \def\go{\pickupwholefraction#1}%
-- \else
-- \let\go = \setuptable
-- \fi%
-- \fi
-- \go
--}
--
--% multitable-only commands.
--%
--% @headitem starts a heading row, which we typeset in bold.
--% Assignments have to be global since we are inside the implicit group
--% of an alignment entry. Note that \everycr resets \everytab.
--\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}%
--%
--% A \tab used to include \hskip1sp. But then the space in a template
--% line is not enough. That is bad. So let's go back to just `&' until
--% we encounter the problem it was intended to solve again.
--% --karl, nathan at acm.org, 20apr99.
--\def\tab{\checkenv\multitable &\the\everytab}%
--
--% @multitable ... @end multitable definitions:
--%
--\newtoks\everytab % insert after every tab.
--%
--\envdef\multitable{%
-- \vskip\parskip
-- \startsavinginserts
-- %
-- % @item within a multitable starts a normal row.
-- % We use \def instead of \let so that if one of the multitable entries
-- % contains an @itemize, we don't choke on the \item (seen as \crcr aka
-- % \endtemplate) expanding \doitemize.
-- \def\item{\crcr}%
-- %
-- \tolerance=9500
-- \hbadness=9500
-- \setmultitablespacing
-- \parskip=\multitableparskip
-- \parindent=\multitableparindent
-- \overfullrule=0pt
-- \global\colcount=0
-- %
-- \everycr = {%
-- \noalign{%
-- \global\everytab={}%
-- \global\colcount=0 % Reset the column counter.
-- % Check for saved footnotes, etc.
-- \checkinserts
-- % Keeps underfull box messages off when table breaks over pages.
-- %\filbreak
-- % Maybe so, but it also creates really weird page breaks when the
-- % table breaks over pages. Wouldn't \vfil be better? Wait until the
-- % problem manifests itself, so it can be fixed for real --karl.
-- }%
-- }%
-- %
-- \parsearg\domultitable
--}
--\def\domultitable#1{%
-- % To parse everything between @multitable and @item:
-- \setuptable#1 \endsetuptable
-- %
-- % This preamble sets up a generic column definition, which will
-- % be used as many times as user calls for columns.
-- % \vtop will set a single line and will also let text wrap and
-- % continue for many paragraphs if desired.
-- \halign\bgroup &%
-- \global\advance\colcount by 1
-- \multistrut
-- \vtop{%
-- % Use the current \colcount to find the correct column width:
-- \hsize=\expandafter\csname col\the\colcount\endcsname
-- %
-- % In order to keep entries from bumping into each other
-- % we will add a \leftskip of \multitablecolspace to all columns after
-- % the first one.
-- %
-- % If a template has been used, we will add \multitablecolspace
-- % to the width of each template entry.
-- %
-- % If the user has set preamble in terms of percent of \hsize we will
-- % use that dimension as the width of the column, and the \leftskip
-- % will keep entries from bumping into each other. Table will start at
-- % left margin and final column will justify at right margin.
-- %
-- % Make sure we don't inherit \rightskip from the outer environment.
-- \rightskip=0pt
-- \ifnum\colcount=1
-- % The first column will be indented with the surrounding text.
-- \advance\hsize by\leftskip
-- \else
-- \ifsetpercent \else
-- % If user has not set preamble in terms of percent of \hsize
-- % we will advance \hsize by \multitablecolspace.
-- \advance\hsize by \multitablecolspace
-- \fi
-- % In either case we will make \leftskip=\multitablecolspace:
-- \leftskip=\multitablecolspace
-- \fi
-- % Ignoring space at the beginning and end avoids an occasional spurious
-- % blank line, when TeX decides to break the line at the space before the
-- % box from the multistrut, so the strut ends up on a line by itself.
-- % For example:
-- % @multitable @columnfractions .11 .89
-- % @item @code{#}
-- % @tab Legal holiday which is valid in major parts of the whole country.
-- % Is automatically provided with highlighting sequences respectively
-- % marking characters.
-- \noindent\ignorespaces##\unskip\multistrut
-- }\cr
--}
--\def\Emultitable{%
-- \crcr
-- \egroup % end the \halign
-- \global\setpercentfalse
--}
--
--\def\setmultitablespacing{%
-- \def\multistrut{\strut}% just use the standard line spacing
-- %
-- % Compute \multitablelinespace (if not defined by user) for use in
-- % \multitableparskip calculation. We used define \multistrut based on
-- % this, but (ironically) that caused the spacing to be off.
-- % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
--\ifdim\multitablelinespace=0pt
--\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
--\global\advance\multitablelinespace by-\ht0
--\fi
--%% Test to see if parskip is larger than space between lines of
--%% table. If not, do nothing.
--%% If so, set to same dimension as multitablelinespace.
--\ifdim\multitableparskip>\multitablelinespace
--\global\multitableparskip=\multitablelinespace
--\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-- %% than skip between lines in the table.
--\fi%
--\ifdim\multitableparskip=0pt
--\global\multitableparskip=\multitablelinespace
--\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-- %% than skip between lines in the table.
--\fi}
--
--
--\message{conditionals,}
--
--% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext,
--% @ifnotxml always succeed. They currently do nothing; we don't
--% attempt to check whether the conditionals are properly nested. But we
--% have to remember that they are conditionals, so that @end doesn't
--% attempt to close an environment group.
--%
--\def\makecond#1{%
-- \expandafter\let\csname #1\endcsname = \relax
-- \expandafter\let\csname iscond.#1\endcsname = 1
--}
--\makecond{iftex}
--\makecond{ifnotdocbook}
--\makecond{ifnothtml}
--\makecond{ifnotinfo}
--\makecond{ifnotplaintext}
--\makecond{ifnotxml}
--
--% Ignore @ignore, @ifhtml, @ifinfo, and the like.
--%
--\def\direntry{\doignore{direntry}}
--\def\documentdescription{\doignore{documentdescription}}
--\def\docbook{\doignore{docbook}}
--\def\html{\doignore{html}}
--\def\ifdocbook{\doignore{ifdocbook}}
--\def\ifhtml{\doignore{ifhtml}}
--\def\ifinfo{\doignore{ifinfo}}
--\def\ifnottex{\doignore{ifnottex}}
--\def\ifplaintext{\doignore{ifplaintext}}
--\def\ifxml{\doignore{ifxml}}
--\def\ignore{\doignore{ignore}}
--\def\menu{\doignore{menu}}
--\def\xml{\doignore{xml}}
--
--% Ignore text until a line `@end #1', keeping track of nested conditionals.
--%
--% A count to remember the depth of nesting.
--\newcount\doignorecount
--
--\def\doignore#1{\begingroup
-- % Scan in ``verbatim'' mode:
-- \obeylines
-- \catcode`\@ = \other
-- \catcode`\{ = \other
-- \catcode`\} = \other
-- %
-- % Make sure that spaces turn into tokens that match what \doignoretext wants.
-- \spaceisspace
-- %
-- % Count number of #1's that we've seen.
-- \doignorecount = 0
-- %
-- % Swallow text until we reach the matching `@end #1'.
-- \dodoignore{#1}%
--}
--
--{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source.
-- \obeylines %
-- %
-- \gdef\dodoignore#1{%
-- % #1 contains the command name as a string, e.g., `ifinfo'.
-- %
-- % Define a command to find the next `@end #1'.
-- \long\def\doignoretext##1^^M at end #1{%
-- \doignoretextyyy##1^^M@#1\_STOP_}%
-- %
-- % And this command to find another #1 command, at the beginning of a
-- % line. (Otherwise, we would consider a line `@c @ifset', for
-- % example, to count as an @ifset for nesting.)
-- \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
-- %
-- % And now expand that command.
-- \doignoretext ^^M%
-- }%
--}
--
--\def\doignoreyyy#1{%
-- \def\temp{#1}%
-- \ifx\temp\empty % Nothing found.
-- \let\next\doignoretextzzz
-- \else % Found a nested condition, ...
-- \advance\doignorecount by 1
-- \let\next\doignoretextyyy % ..., look for another.
-- % If we're here, #1 ends with ^^M\ifinfo (for example).
-- \fi
-- \next #1% the token \_STOP_ is present just after this macro.
--}
--
--% We have to swallow the remaining "\_STOP_".
--%
--\def\doignoretextzzz#1{%
-- \ifnum\doignorecount = 0 % We have just found the outermost @end.
-- \let\next\enddoignore
-- \else % Still inside a nested condition.
-- \advance\doignorecount by -1
-- \let\next\doignoretext % Look for the next @end.
-- \fi
-- \next
--}
--
--% Finish off ignored text.
--{ \obeylines%
-- % Ignore anything after the last `@end #1'; this matters in verbatim
-- % environments, where otherwise the newline after an ignored conditional
-- % would result in a blank line in the output.
-- \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
--}
--
--
--% @set VAR sets the variable VAR to an empty value.
--% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
--%
--% Since we want to separate VAR from REST-OF-LINE (which might be
--% empty), we can't just use \parsearg; we have to insert a space of our
--% own to delimit the rest of the line, and then take it out again if we
--% didn't need it.
--% We rely on the fact that \parsearg sets \catcode`\ =10.
--%
--\parseargdef\set{\setyyy#1 \endsetyyy}
--\def\setyyy#1 #2\endsetyyy{%
-- {%
-- \makevalueexpandable
-- \def\temp{#2}%
-- \edef\next{\gdef\makecsname{SET#1}}%
-- \ifx\temp\empty
-- \next{}%
-- \else
-- \setzzz#2\endsetzzz
-- \fi
-- }%
--}
--% Remove the trailing space \setxxx inserted.
--\def\setzzz#1 \endsetzzz{\next{#1}}
--
--% @clear VAR clears (i.e., unsets) the variable VAR.
--%
--\parseargdef\clear{%
-- {%
-- \makevalueexpandable
-- \global\expandafter\let\csname SET#1\endcsname=\relax
-- }%
--}
--
--% @value{foo} gets the text saved in variable foo.
--\def\value{\begingroup\makevalueexpandable\valuexxx}
--\def\valuexxx#1{\expandablevalue{#1}\endgroup}
--{
-- \catcode`\- = \active \catcode`\_ = \active
-- %
-- \gdef\makevalueexpandable{%
-- \let\value = \expandablevalue
-- % We don't want these characters active, ...
-- \catcode`\-=\other \catcode`\_=\other
-- % ..., but we might end up with active ones in the argument if
-- % we're called from @code, as @code{@value{foo-bar_}}, though.
-- % So \let them to their normal equivalents.
-- \let-\realdash \let_\normalunderscore
-- }
--}
--
--% We have this subroutine so that we can handle at least some @value's
--% properly in indexes (we call \makevalueexpandable in \indexdummies).
--% The command has to be fully expandable (if the variable is set), since
--% the result winds up in the index file. This means that if the
--% variable's value contains other Texinfo commands, it's almost certain
--% it will fail (although perhaps we could fix that with sufficient work
--% to do a one-level expansion on the result, instead of complete).
--%
--\def\expandablevalue#1{%
-- \expandafter\ifx\csname SET#1\endcsname\relax
-- {[No value for ``#1'']}%
-- \message{Variable `#1', used in @value, is not set.}%
-- \else
-- \csname SET#1\endcsname
-- \fi
--}
--
--% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
--% with @set.
--%
--% To get special treatment of `@end ifset,' call \makeond and the redefine.
--%
--\makecond{ifset}
--\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
--\def\doifset#1#2{%
-- {%
-- \makevalueexpandable
-- \let\next=\empty
-- \expandafter\ifx\csname SET#2\endcsname\relax
-- #1% If not set, redefine \next.
-- \fi
-- \expandafter
-- }\next
--}
--\def\ifsetfail{\doignore{ifset}}
--
--% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
--% defined with @set, or has been undefined with @clear.
--%
--% The `\else' inside the `\doifset' parameter is a trick to reuse the
--% above code: if the variable is not set, do nothing, if it is set,
--% then redefine \next to \ifclearfail.
--%
--\makecond{ifclear}
--\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
--\def\ifclearfail{\doignore{ifclear}}
--
--% @dircategory CATEGORY -- specify a category of the dir file
--% which this file should belong to. Ignore this in TeX.
--\let\dircategory=\comment
--
--% @defininfoenclose.
--\let\definfoenclose=\comment
--
--
--\message{indexing,}
--% Index generation facilities
--
--% Define \newwrite to be identical to plain tex's \newwrite
--% except not \outer, so it can be used within macros and \if's.
--\edef\newwrite{\makecsname{ptexnewwrite}}
--
--% \newindex {foo} defines an index named foo.
--% It automatically defines \fooindex such that
--% \fooindex ...rest of line... puts an entry in the index foo.
--% It also defines \fooindfile to be the number of the output channel for
--% the file that accumulates this index. The file's extension is foo.
--% The name of an index should be no more than 2 characters long
--% for the sake of vms.
--%
--\def\newindex#1{%
-- \iflinks
-- \expandafter\newwrite \csname#1indfile\endcsname
-- \openout \csname#1indfile\endcsname \jobname.#1 % Open the file
-- \fi
-- \expandafter\xdef\csname#1index\endcsname{% % Define @#1index
-- \noexpand\doindex{#1}}
--}
--
--% @defindex foo == \newindex{foo}
--%
--\def\defindex{\parsearg\newindex}
--
--% Define @defcodeindex, like @defindex except put all entries in @code.
--%
--\def\defcodeindex{\parsearg\newcodeindex}
--%
--\def\newcodeindex#1{%
-- \iflinks
-- \expandafter\newwrite \csname#1indfile\endcsname
-- \openout \csname#1indfile\endcsname \jobname.#1
-- \fi
-- \expandafter\xdef\csname#1index\endcsname{%
-- \noexpand\docodeindex{#1}}%
--}
--
--
--% @synindex foo bar makes index foo feed into index bar.
--% Do this instead of @defindex foo if you don't want it as a separate index.
--%
--% @syncodeindex foo bar similar, but put all entries made for index foo
--% inside @code.
--%
--\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}}
--\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}}
--
--% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo),
--% #3 the target index (bar).
--\def\dosynindex#1#2#3{%
-- % Only do \closeout if we haven't already done it, else we'll end up
-- % closing the target index.
-- \expandafter \ifx\csname donesynindex#2\endcsname \undefined
-- % The \closeout helps reduce unnecessary open files; the limit on the
-- % Acorn RISC OS is a mere 16 files.
-- \expandafter\closeout\csname#2indfile\endcsname
-- \expandafter\let\csname\donesynindex#2\endcsname = 1
-- \fi
-- % redefine \fooindfile:
-- \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
-- \expandafter\let\csname#2indfile\endcsname=\temp
-- % redefine \fooindex:
-- \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}%
--}
--
--% Define \doindex, the driver for all \fooindex macros.
--% Argument #1 is generated by the calling \fooindex macro,
--% and it is "foo", the name of the index.
--
--% \doindex just uses \parsearg; it calls \doind for the actual work.
--% This is because \doind is more useful to call from other macros.
--
--% There is also \dosubind {index}{topic}{subtopic}
--% which makes an entry in a two-level index such as the operation index.
--
--\def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer}
--\def\singleindexer #1{\doind{\indexname}{#1}}
--
--% like the previous two, but they put @code around the argument.
--\def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
--\def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
--
--% Take care of Texinfo commands that can appear in an index entry.
--% Since there are some commands we want to expand, and others we don't,
--% we have to laboriously prevent expansion for those that we don't.
--%
--\def\indexdummies{%
-- \escapechar = `\\ % use backslash in output files.
-- \def\@{@}% change to @@ when we switch to @ as escape char in index files.
-- \def\ {\realbackslash\space }%
-- %
-- % Need these in case \tex is in effect and \{ is a \delimiter again.
-- % But can't use \lbracecmd and \rbracecmd because texindex assumes
-- % braces and backslashes are used only as delimiters.
-- \let\{ = \mylbrace
-- \let\} = \myrbrace
-- %
-- % I don't entirely understand this, but when an index entry is
-- % generated from a macro call, the \endinput which \scanmacro inserts
-- % causes processing to be prematurely terminated. This is,
-- % apparently, because \indexsorttmp is fully expanded, and \endinput
-- % is an expandable command. The redefinition below makes \endinput
-- % disappear altogether for that purpose -- although logging shows that
-- % processing continues to some further point. On the other hand, it
-- % seems \endinput does not hurt in the printed index arg, since that
-- % is still getting written without apparent harm.
-- %
-- % Sample source (mac-idx3.tex, reported by Graham Percival to
-- % help-texinfo, 22may06):
-- % @macro funindex {WORD}
-- % @findex xyz
-- % @end macro
-- % ...
-- % @funindex commtest
-- %
-- % The above is not enough to reproduce the bug, but it gives the flavor.
-- %
-- % Sample whatsit resulting:
-- % . at write3{\entry{xyz}{@folio }{@code {xyz at endinput }}}
-- %
-- % So:
-- \let\endinput = \empty
-- %
-- % Do the redefinitions.
-- \commondummies
--}
--
--% For the aux and toc files, @ is the escape character. So we want to
--% redefine everything using @ as the escape character (instead of
--% \realbackslash, still used for index files). When everything uses @,
--% this will be simpler.
--%
--\def\atdummies{%
-- \def\@{@@}%
-- \def\ {@ }%
-- \let\{ = \lbraceatcmd
-- \let\} = \rbraceatcmd
-- %
-- % Do the redefinitions.
-- \commondummies
-- \otherbackslash
--}
--
--% Called from \indexdummies and \atdummies.
--%
--\def\commondummies{%
-- %
-- % \definedummyword defines \#1 as \string\#1\space, thus effectively
-- % preventing its expansion. This is used only for control% words,
-- % not control letters, because the \space would be incorrect for
-- % control characters, but is needed to separate the control word
-- % from whatever follows.
-- %
-- % For control letters, we have \definedummyletter, which omits the
-- % space.
-- %
-- % These can be used both for control words that take an argument and
-- % those that do not. If it is followed by {arg} in the input, then
-- % that will dutifully get written to the index (or wherever).
-- %
-- \def\definedummyword ##1{\def##1{\string##1\space}}%
-- \def\definedummyletter##1{\def##1{\string##1}}%
-- \let\definedummyaccent\definedummyletter
-- %
-- \commondummiesnofonts
-- %
-- \definedummyletter\_%
-- %
-- % Non-English letters.
-- \definedummyword\AA
-- \definedummyword\AE
-- \definedummyword\L
-- \definedummyword\OE
-- \definedummyword\O
-- \definedummyword\aa
-- \definedummyword\ae
-- \definedummyword\l
-- \definedummyword\oe
-- \definedummyword\o
-- \definedummyword\ss
-- \definedummyword\exclamdown
-- \definedummyword\questiondown
-- \definedummyword\ordf
-- \definedummyword\ordm
-- %
-- % Although these internal commands shouldn't show up, sometimes they do.
-- \definedummyword\bf
-- \definedummyword\gtr
-- \definedummyword\hat
-- \definedummyword\less
-- \definedummyword\sf
-- \definedummyword\sl
-- \definedummyword\tclose
-- \definedummyword\tt
-- %
-- \definedummyword\LaTeX
-- \definedummyword\TeX
-- %
-- % Assorted special characters.
-- \definedummyword\bullet
-- \definedummyword\comma
-- \definedummyword\copyright
-- \definedummyword\registeredsymbol
-- \definedummyword\dots
-- \definedummyword\enddots
-- \definedummyword\equiv
-- \definedummyword\error
-- \definedummyword\euro
-- \definedummyword\expansion
-- \definedummyword\minus
-- \definedummyword\pounds
-- \definedummyword\point
-- \definedummyword\print
-- \definedummyword\result
-- \definedummyword\textdegree
-- %
-- % We want to disable all macros so that they are not expanded by \write.
-- \macrolist
-- %
-- \normalturnoffactive
-- %
-- % Handle some cases of @value -- where it does not contain any
-- % (non-fully-expandable) commands.
-- \makevalueexpandable
--}
--
--% \commondummiesnofonts: common to \commondummies and \indexnofonts.
--%
--\def\commondummiesnofonts{%
-- % Control letters and accents.
-- \definedummyletter\!%
-- \definedummyaccent\"%
-- \definedummyaccent\'%
-- \definedummyletter\*%
-- \definedummyaccent\,%
-- \definedummyletter\.%
-- \definedummyletter\/%
-- \definedummyletter\:%
-- \definedummyaccent\=%
-- \definedummyletter\?%
-- \definedummyaccent\^%
-- \definedummyaccent\`%
-- \definedummyaccent\~%
-- \definedummyword\u
-- \definedummyword\v
-- \definedummyword\H
-- \definedummyword\dotaccent
-- \definedummyword\ringaccent
-- \definedummyword\tieaccent
-- \definedummyword\ubaraccent
-- \definedummyword\udotaccent
-- \definedummyword\dotless
-- %
-- % Texinfo font commands.
-- \definedummyword\b
-- \definedummyword\i
-- \definedummyword\r
-- \definedummyword\sc
-- \definedummyword\t
-- %
-- % Commands that take arguments.
-- \definedummyword\acronym
-- \definedummyword\cite
-- \definedummyword\code
-- \definedummyword\command
-- \definedummyword\dfn
-- \definedummyword\emph
-- \definedummyword\env
-- \definedummyword\file
-- \definedummyword\kbd
-- \definedummyword\key
-- \definedummyword\math
-- \definedummyword\option
-- \definedummyword\pxref
-- \definedummyword\ref
-- \definedummyword\samp
-- \definedummyword\strong
-- \definedummyword\tie
-- \definedummyword\uref
-- \definedummyword\url
-- \definedummyword\var
-- \definedummyword\verb
-- \definedummyword\w
-- \definedummyword\xref
--}
--
--% \indexnofonts is used when outputting the strings to sort the index
--% by, and when constructing control sequence names. It eliminates all
--% control sequences and just writes whatever the best ASCII sort string
--% would be for a given command (usually its argument).
--%
--\def\indexnofonts{%
-- % Accent commands should become @asis.
-- \def\definedummyaccent##1{\let##1\asis}%
-- % We can just ignore other control letters.
-- \def\definedummyletter##1{\let##1\empty}%
-- % Hopefully, all control words can become @asis.
-- \let\definedummyword\definedummyaccent
-- %
-- \commondummiesnofonts
-- %
-- % Don't no-op \tt, since it isn't a user-level command
-- % and is used in the definitions of the active chars like <, >, |, etc.
-- % Likewise with the other plain tex font commands.
-- %\let\tt=\asis
-- %
-- \def\ { }%
-- \def\@{@}%
-- % how to handle braces?
-- \def\_{\normalunderscore}%
-- %
-- % Non-English letters.
-- \def\AA{AA}%
-- \def\AE{AE}%
-- \def\L{L}%
-- \def\OE{OE}%
-- \def\O{O}%
-- \def\aa{aa}%
-- \def\ae{ae}%
-- \def\l{l}%
-- \def\oe{oe}%
-- \def\o{o}%
-- \def\ss{ss}%
-- \def\exclamdown{!}%
-- \def\questiondown{?}%
-- \def\ordf{a}%
-- \def\ordm{o}%
-- %
-- \def\LaTeX{LaTeX}%
-- \def\TeX{TeX}%
-- %
-- % Assorted special characters.
-- % (The following {} will end up in the sort string, but that's ok.)
-- \def\bullet{bullet}%
-- \def\comma{,}%
-- \def\copyright{copyright}%
-- \def\registeredsymbol{R}%
-- \def\dots{...}%
-- \def\enddots{...}%
-- \def\equiv{==}%
-- \def\error{error}%
-- \def\euro{euro}%
-- \def\expansion{==>}%
-- \def\minus{-}%
-- \def\pounds{pounds}%
-- \def\point{.}%
-- \def\print{-|}%
-- \def\result{=>}%
-- \def\textdegree{degrees}%
-- %
-- % We need to get rid of all macros, leaving only the arguments (if present).
-- % Of course this is not nearly correct, but it is the best we can do for now.
-- % makeinfo does not expand macros in the argument to @deffn, which ends up
-- % writing an index entry, and texindex isn't prepared for an index sort entry
-- % that starts with \.
-- %
-- % Since macro invocations are followed by braces, we can just redefine them
-- % to take a single TeX argument. The case of a macro invocation that
-- % goes to end-of-line is not handled.
-- %
-- \macrolist
--}
--
--\let\indexbackslash=0 %overridden during \printindex.
--\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
--
--% Most index entries go through here, but \dosubind is the general case.
--% #1 is the index name, #2 is the entry text.
--\def\doind#1#2{\dosubind{#1}{#2}{}}
--
--% Workhorse for all \fooindexes.
--% #1 is name of index, #2 is stuff to put there, #3 is subentry --
--% empty if called from \doind, as we usually are (the main exception
--% is with most defuns, which call us directly).
--%
--\def\dosubind#1#2#3{%
-- \iflinks
-- {%
-- % Store the main index entry text (including the third arg).
-- \toks0 = {#2}%
-- % If third arg is present, precede it with a space.
-- \def\thirdarg{#3}%
-- \ifx\thirdarg\empty \else
-- \toks0 = \expandafter{\the\toks0 \space #3}%
-- \fi
-- %
-- \edef\writeto{\csname#1indfile\endcsname}%
-- %
-- \safewhatsit\dosubindwrite
-- }%
-- \fi
--}
--
--% Write the entry in \toks0 to the index file:
--%
--\def\dosubindwrite{%
-- % Put the index entry in the margin if desired.
-- \ifx\SETmarginindex\relax\else
-- \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
-- \fi
-- %
-- % Remember, we are within a group.
-- \indexdummies % Must do this here, since \bf, etc expand at this stage
-- \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
-- % so it will be output as is; and it will print as backslash.
-- %
-- % Process the index entry with all font commands turned off, to
-- % get the string to sort by.
-- {\indexnofonts
-- \edef\temp{\the\toks0}% need full expansion
-- \xdef\indexsorttmp{\temp}%
-- }%
-- %
-- % Set up the complete index entry, with both the sort key and
-- % the original text, including any font commands. We write
-- % three arguments to \entry to the .?? file (four in the
-- % subentry case), texindex reduces to two when writing the .??s
-- % sorted result.
-- \edef\temp{%
-- \write\writeto{%
-- \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}%
-- }%
-- \temp
--}
--
--% Take care of unwanted page breaks/skips around a whatsit:
--%
--% If a skip is the last thing on the list now, preserve it
--% by backing up by \lastskip, doing the \write, then inserting
--% the skip again. Otherwise, the whatsit generated by the
--% \write or \pdfdest will make \lastskip zero. The result is that
--% sequences like this:
--% @end defun
--% @tindex whatever
--% @defun ...
--% will have extra space inserted, because the \medbreak in the
--% start of the @defun won't see the skip inserted by the @end of
--% the previous defun.
--%
--% But don't do any of this if we're not in vertical mode. We
--% don't want to do a \vskip and prematurely end a paragraph.
--%
--% Avoid page breaks due to these extra skips, too.
--%
--% But wait, there is a catch there:
--% We'll have to check whether \lastskip is zero skip. \ifdim is not
--% sufficient for this purpose, as it ignores stretch and shrink parts
--% of the skip. The only way seems to be to check the textual
--% representation of the skip.
--%
--% The following is almost like \def\zeroskipmacro{0.0pt} except that
--% the ``p'' and ``t'' characters have catcode \other, not 11 (letter).
--%
--\edef\zeroskipmacro{\expandafter\the\csname z at skip\endcsname}
--%
--\newskip\whatsitskip
--\newcount\whatsitpenalty
--%
--% ..., ready, GO:
--%
--\def\safewhatsit#1{%
--\ifhmode
-- #1%
--\else
-- % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
-- \whatsitskip = \lastskip
-- \edef\lastskipmacro{\the\lastskip}%
-- \whatsitpenalty = \lastpenalty
-- %
-- % If \lastskip is nonzero, that means the last item was a
-- % skip. And since a skip is discardable, that means this
-- % -\skip0 glue we're inserting is preceded by a
-- % non-discardable item, therefore it is not a potential
-- % breakpoint, therefore no \nobreak needed.
-- \ifx\lastskipmacro\zeroskipmacro
-- \else
-- \vskip-\whatsitskip
-- \fi
-- %
-- #1%
-- %
-- \ifx\lastskipmacro\zeroskipmacro
-- % If \lastskip was zero, perhaps the last item was a penalty, and
-- % perhaps it was >=10000, e.g., a \nobreak. In that case, we want
-- % to re-insert the same penalty (values >10000 are used for various
-- % signals); since we just inserted a non-discardable item, any
-- % following glue (such as a \parskip) would be a breakpoint. For example:
-- %
-- % @deffn deffn-whatever
-- % @vindex index-whatever
-- % Description.
-- % would allow a break between the index-whatever whatsit
-- % and the "Description." paragraph.
-- \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
-- \else
-- % On the other hand, if we had a nonzero \lastskip,
-- % this make-up glue would be preceded by a non-discardable item
-- % (the whatsit from the \write), so we must insert a \nobreak.
-- \nobreak\vskip\whatsitskip
-- \fi
--\fi
--}
--
--% The index entry written in the file actually looks like
--% \entry {sortstring}{page}{topic}
--% or
--% \entry {sortstring}{page}{topic}{subtopic}
--% The texindex program reads in these files and writes files
--% containing these kinds of lines:
--% \initial {c}
--% before the first topic whose initial is c
--% \entry {topic}{pagelist}
--% for a topic that is used without subtopics
--% \primary {topic}
--% for the beginning of a topic that is used with subtopics
--% \secondary {subtopic}{pagelist}
--% for each subtopic.
--
--% Define the user-accessible indexing commands
--% @findex, @vindex, @kindex, @cindex.
--
--\def\findex {\fnindex}
--\def\kindex {\kyindex}
--\def\cindex {\cpindex}
--\def\vindex {\vrindex}
--\def\tindex {\tpindex}
--\def\pindex {\pgindex}
--
--\def\cindexsub {\begingroup\obeylines\cindexsub}
--{\obeylines %
--\gdef\cindexsub "#1" #2^^M{\endgroup %
--\dosubind{cp}{#2}{#1}}}
--
--% Define the macros used in formatting output of the sorted index material.
--
--% @printindex causes a particular index (the ??s file) to get printed.
--% It does not print any chapter heading (usually an @unnumbered).
--%
--\parseargdef\printindex{\begingroup
-- \dobreak \chapheadingskip{10000}%
-- %
-- \smallfonts \rm
-- \tolerance = 9500
-- \plainfrenchspacing
-- \everypar = {}% don't want the \kern\-parindent from indentation suppression.
-- %
-- % See if the index file exists and is nonempty.
-- % Change catcode of @ here so that if the index file contains
-- % \initial {@}
-- % as its first line, TeX doesn't complain about mismatched braces
-- % (because it thinks @} is a control sequence).
-- \catcode`\@ = 11
-- \openin 1 \jobname.#1s
-- \ifeof 1
-- % \enddoublecolumns gets confused if there is no text in the index,
-- % and it loses the chapter title and the aux file entries for the
-- % index. The easiest way to prevent this problem is to make sure
-- % there is some text.
-- \putwordIndexNonexistent
-- \else
-- %
-- % If the index file exists but is empty, then \openin leaves \ifeof
-- % false. We have to make TeX try to read something from the file, so
-- % it can discover if there is anything in it.
-- \read 1 to \temp
-- \ifeof 1
-- \putwordIndexIsEmpty
-- \else
-- % Index files are almost Texinfo source, but we use \ as the escape
-- % character. It would be better to use @, but that's too big a change
-- % to make right now.
-- \def\indexbackslash{\backslashcurfont}%
-- \catcode`\\ = 0
-- \escapechar = `\\
-- \begindoublecolumns
-- \input \jobname.#1s
-- \enddoublecolumns
-- \fi
-- \fi
-- \closein 1
--\endgroup}
--
--% These macros are used by the sorted index file itself.
--% Change them to control the appearance of the index.
--
--\def\initial#1{{%
-- % Some minor font changes for the special characters.
-- \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt
-- %
-- % Remove any glue we may have, we'll be inserting our own.
-- \removelastskip
-- %
-- % We like breaks before the index initials, so insert a bonus.
-- \nobreak
-- \vskip 0pt plus 3\baselineskip
-- \penalty 0
-- \vskip 0pt plus -3\baselineskip
-- %
-- % Typeset the initial. Making this add up to a whole number of
-- % baselineskips increases the chance of the dots lining up from column
-- % to column. It still won't often be perfect, because of the stretch
-- % we need before each entry, but it's better.
-- %
-- % No shrink because it confuses \balancecolumns.
-- \vskip 1.67\baselineskip plus .5\baselineskip
-- \leftline{\secbf #1}%
-- % Do our best not to break after the initial.
-- \nobreak
-- \vskip .33\baselineskip plus .1\baselineskip
--}}
--
--% \entry typesets a paragraph consisting of the text (#1), dot leaders, and
--% then page number (#2) flushed to the right margin. It is used for index
--% and table of contents entries. The paragraph is indented by \leftskip.
--%
--% A straightforward implementation would start like this:
--% \def\entry#1#2{...
--% But this frozes the catcodes in the argument, and can cause problems to
--% @code, which sets - active. This problem was fixed by a kludge---
--% ``-'' was active throughout whole index, but this isn't really right.
--%
--% The right solution is to prevent \entry from swallowing the whole text.
--% --kasal, 21nov03
--\def\entry{%
-- \begingroup
-- %
-- % Start a new paragraph if necessary, so our assignments below can't
-- % affect previous text.
-- \par
-- %
-- % Do not fill out the last line with white space.
-- \parfillskip = 0in
-- %
-- % No extra space above this paragraph.
-- \parskip = 0in
-- %
-- % Do not prefer a separate line ending with a hyphen to fewer lines.
-- \finalhyphendemerits = 0
-- %
-- % \hangindent is only relevant when the entry text and page number
-- % don't both fit on one line. In that case, bob suggests starting the
-- % dots pretty far over on the line. Unfortunately, a large
-- % indentation looks wrong when the entry text itself is broken across
-- % lines. So we use a small indentation and put up with long leaders.
-- %
-- % \hangafter is reset to 1 (which is the value we want) at the start
-- % of each paragraph, so we need not do anything with that.
-- \hangindent = 2em
-- %
-- % When the entry text needs to be broken, just fill out the first line
-- % with blank space.
-- \rightskip = 0pt plus1fil
-- %
-- % A bit of stretch before each entry for the benefit of balancing
-- % columns.
-- \vskip 0pt plus1pt
-- %
-- % Swallow the left brace of the text (first parameter):
-- \afterassignment\doentry
-- \let\temp =
--}
--\def\doentry{%
-- \bgroup % Instead of the swallowed brace.
-- \noindent
-- \aftergroup\finishentry
-- % And now comes the text of the entry.
--}
--\def\finishentry#1{%
-- % #1 is the page number.
-- %
-- % The following is kludged to not output a line of dots in the index if
-- % there are no page numbers. The next person who breaks this will be
-- % cursed by a Unix daemon.
-- \def\tempa{{\rm }}%
-- \def\tempb{#1}%
-- \edef\tempc{\tempa}%
-- \edef\tempd{\tempb}%
-- \ifx\tempc\tempd
-- \ %
-- \else
-- %
-- % If we must, put the page number on a line of its own, and fill out
-- % this line with blank space. (The \hfil is overwhelmed with the
-- % fill leaders glue in \indexdotfill if the page number does fit.)
-- \hfil\penalty50
-- \null\nobreak\indexdotfill % Have leaders before the page number.
-- %
-- % The `\ ' here is removed by the implicit \unskip that TeX does as
-- % part of (the primitive) \par. Without it, a spurious underfull
-- % \hbox ensues.
-- \ifpdf
-- \pdfgettoks#1.%
-- \ \the\toksA
-- \else
-- \ #1%
-- \fi
-- \fi
-- \par
-- \endgroup
--}
--
--% Like plain.tex's \dotfill, except uses up at least 1 em.
--\def\indexdotfill{\cleaders
-- \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
--
--\def\primary #1{\line{#1\hfil}}
--
--\newskip\secondaryindent \secondaryindent=0.5cm
--\def\secondary#1#2{{%
-- \parfillskip=0in
-- \parskip=0in
-- \hangindent=1in
-- \hangafter=1
-- \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
-- \ifpdf
-- \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
-- \else
-- #2
-- \fi
-- \par
--}}
--
--% Define two-column mode, which we use to typeset indexes.
--% Adapted from the TeXbook, page 416, which is to say,
--% the manmac.tex format used to print the TeXbook itself.
--\catcode`\@=11
--
--\newbox\partialpage
--\newdimen\doublecolumnhsize
--
--\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
-- % Grab any single-column material above us.
-- \output = {%
-- %
-- % Here is a possibility not foreseen in manmac: if we accumulate a
-- % whole lot of material, we might end up calling this \output
-- % routine twice in a row (see the doublecol-lose test, which is
-- % essentially a couple of indexes with @setchapternewpage off). In
-- % that case we just ship out what is in \partialpage with the normal
-- % output routine. Generally, \partialpage will be empty when this
-- % runs and this will be a no-op. See the indexspread.tex test case.
-- \ifvoid\partialpage \else
-- \onepageout{\pagecontents\partialpage}%
-- \fi
-- %
-- \global\setbox\partialpage = \vbox{%
-- % Unvbox the main output page.
-- \unvbox\PAGE
-- \kern-\topskip \kern\baselineskip
-- }%
-- }%
-- \eject % run that output routine to set \partialpage
-- %
-- % Use the double-column output routine for subsequent pages.
-- \output = {\doublecolumnout}%
-- %
-- % Change the page size parameters. We could do this once outside this
-- % routine, in each of @smallbook, @afourpaper, and the default 8.5x11
-- % format, but then we repeat the same computation. Repeating a couple
-- % of assignments once per index is clearly meaningless for the
-- % execution time, so we may as well do it in one place.
-- %
-- % First we halve the line length, less a little for the gutter between
-- % the columns. We compute the gutter based on the line length, so it
-- % changes automatically with the paper format. The magic constant
-- % below is chosen so that the gutter has the same value (well, +-<1pt)
-- % as it did when we hard-coded it.
-- %
-- % We put the result in a separate register, \doublecolumhsize, so we
-- % can restore it in \pagesofar, after \hsize itself has (potentially)
-- % been clobbered.
-- %
-- \doublecolumnhsize = \hsize
-- \advance\doublecolumnhsize by -.04154\hsize
-- \divide\doublecolumnhsize by 2
-- \hsize = \doublecolumnhsize
-- %
-- % Double the \vsize as well. (We don't need a separate register here,
-- % since nobody clobbers \vsize.)
-- \vsize = 2\vsize
--}
--
--% The double-column output routine for all double-column pages except
--% the last.
--%
--\def\doublecolumnout{%
-- \splittopskip=\topskip \splitmaxdepth=\maxdepth
-- % Get the available space for the double columns -- the normal
-- % (undoubled) page height minus any material left over from the
-- % previous page.
-- \dimen@ = \vsize
-- \divide\dimen@ by 2
-- \advance\dimen@ by -\ht\partialpage
-- %
-- % box0 will be the left-hand column, box2 the right.
-- \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
-- \onepageout\pagesofar
-- \unvbox255
-- \penalty\outputpenalty
--}
--%
--% Re-output the contents of the output page -- any previous material,
--% followed by the two boxes we just split, in box0 and box2.
--\def\pagesofar{%
-- \unvbox\partialpage
-- %
-- \hsize = \doublecolumnhsize
-- \wd0=\hsize \wd2=\hsize
-- \hbox to\pagewidth{\box0\hfil\box2}%
--}
--%
--% All done with double columns.
--\def\enddoublecolumns{%
-- % The following penalty ensures that the page builder is exercised
-- % _before_ we change the output routine. This is necessary in the
-- % following situation:
-- %
-- % The last section of the index consists only of a single entry.
-- % Before this section, \pagetotal is less than \pagegoal, so no
-- % break occurs before the last section starts. However, the last
-- % section, consisting of \initial and the single \entry, does not
-- % fit on the page and has to be broken off. Without the following
-- % penalty the page builder will not be exercised until \eject
-- % below, and by that time we'll already have changed the output
-- % routine to the \balancecolumns version, so the next-to-last
-- % double-column page will be processed with \balancecolumns, which
-- % is wrong: The two columns will go to the main vertical list, with
-- % the broken-off section in the recent contributions. As soon as
-- % the output routine finishes, TeX starts reconsidering the page
-- % break. The two columns and the broken-off section both fit on the
-- % page, because the two columns now take up only half of the page
-- % goal. When TeX sees \eject from below which follows the final
-- % section, it invokes the new output routine that we've set after
-- % \balancecolumns below; \onepageout will try to fit the two columns
-- % and the final section into the vbox of \pageheight (see
-- % \pagebody), causing an overfull box.
-- %
-- % Note that glue won't work here, because glue does not exercise the
-- % page builder, unlike penalties (see The TeXbook, pp. 280-281).
-- \penalty0
-- %
-- \output = {%
-- % Split the last of the double-column material. Leave it on the
-- % current page, no automatic page break.
-- \balancecolumns
-- %
-- % If we end up splitting too much material for the current page,
-- % though, there will be another page break right after this \output
-- % invocation ends. Having called \balancecolumns once, we do not
-- % want to call it again. Therefore, reset \output to its normal
-- % definition right away. (We hope \balancecolumns will never be
-- % called on to balance too much material, but if it is, this makes
-- % the output somewhat more palatable.)
-- \global\output = {\onepageout{\pagecontents\PAGE}}%
-- }%
-- \eject
-- \endgroup % started in \begindoublecolumns
-- %
-- % \pagegoal was set to the doubled \vsize above, since we restarted
-- % the current page. We're now back to normal single-column
-- % typesetting, so reset \pagegoal to the normal \vsize (after the
-- % \endgroup where \vsize got restored).
-- \pagegoal = \vsize
--}
--%
--% Called at the end of the double column material.
--\def\balancecolumns{%
-- \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
-- \dimen@ = \ht0
-- \advance\dimen@ by \topskip
-- \advance\dimen@ by-\baselineskip
-- \divide\dimen@ by 2 % target to split to
-- %debug\message{final 2-column material height=\the\ht0, target=\the\dimen at .}%
-- \splittopskip = \topskip
-- % Loop until we get a decent breakpoint.
-- {%
-- \vbadness = 10000
-- \loop
-- \global\setbox3 = \copy0
-- \global\setbox1 = \vsplit3 to \dimen@
-- \ifdim\ht3>\dimen@
-- \global\advance\dimen@ by 1pt
-- \repeat
-- }%
-- %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}%
-- \setbox0=\vbox to\dimen@{\unvbox1}%
-- \setbox2=\vbox to\dimen@{\unvbox3}%
-- %
-- \pagesofar
--}
--\catcode`\@ = \other
--
--
--\message{sectioning,}
--% Chapters, sections, etc.
--
--% \unnumberedno is an oxymoron, of course. But we count the unnumbered
--% sections so that we can refer to them unambiguously in the pdf
--% outlines by their "section number". We avoid collisions with chapter
--% numbers by starting them at 10000. (If a document ever has 10000
--% chapters, we're in trouble anyway, I'm sure.)
--\newcount\unnumberedno \unnumberedno = 10000
--\newcount\chapno
--\newcount\secno \secno=0
--\newcount\subsecno \subsecno=0
--\newcount\subsubsecno \subsubsecno=0
--
--% This counter is funny since it counts through charcodes of letters A, B, ...
--\newcount\appendixno \appendixno = `\@
--%
--% \def\appendixletter{\char\the\appendixno}
--% We do the following ugly conditional instead of the above simple
--% construct for the sake of pdftex, which needs the actual
--% letter in the expansion, not just typeset.
--%
--\def\appendixletter{%
-- \ifnum\appendixno=`A A%
-- \else\ifnum\appendixno=`B B%
-- \else\ifnum\appendixno=`C C%
-- \else\ifnum\appendixno=`D D%
-- \else\ifnum\appendixno=`E E%
-- \else\ifnum\appendixno=`F F%
-- \else\ifnum\appendixno=`G G%
-- \else\ifnum\appendixno=`H H%
-- \else\ifnum\appendixno=`I I%
-- \else\ifnum\appendixno=`J J%
-- \else\ifnum\appendixno=`K K%
-- \else\ifnum\appendixno=`L L%
-- \else\ifnum\appendixno=`M M%
-- \else\ifnum\appendixno=`N N%
-- \else\ifnum\appendixno=`O O%
-- \else\ifnum\appendixno=`P P%
-- \else\ifnum\appendixno=`Q Q%
-- \else\ifnum\appendixno=`R R%
-- \else\ifnum\appendixno=`S S%
-- \else\ifnum\appendixno=`T T%
-- \else\ifnum\appendixno=`U U%
-- \else\ifnum\appendixno=`V V%
-- \else\ifnum\appendixno=`W W%
-- \else\ifnum\appendixno=`X X%
-- \else\ifnum\appendixno=`Y Y%
-- \else\ifnum\appendixno=`Z Z%
-- % The \the is necessary, despite appearances, because \appendixletter is
-- % expanded while writing the .toc file. \char\appendixno is not
-- % expandable, thus it is written literally, thus all appendixes come out
-- % with the same letter (or @) in the toc without it.
-- \else\char\the\appendixno
-- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
-- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
--
--% Each @chapter defines this as the name of the chapter.
--% page headings and footings can use it. @section does likewise.
--% However, they are not reliable, because we don't use marks.
--\def\thischapter{}
--\def\thissection{}
--
--\newcount\absseclevel % used to calculate proper heading level
--\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
--
--% @raisesections: treat @section as chapter, @subsection as section, etc.
--\def\raisesections{\global\advance\secbase by -1}
--\let\up=\raisesections % original BFox name
--
--% @lowersections: treat @chapter as section, @section as subsection, etc.
--\def\lowersections{\global\advance\secbase by 1}
--\let\down=\lowersections % original BFox name
--
--% we only have subsub.
--\chardef\maxseclevel = 3
--%
--% A numbered section within an unnumbered changes to unnumbered too.
--% To achive this, remember the "biggest" unnum. sec. we are currently in:
--\chardef\unmlevel = \maxseclevel
--%
--% Trace whether the current chapter is an appendix or not:
--% \chapheadtype is "N" or "A", unnumbered chapters are ignored.
--\def\chapheadtype{N}
--
--% Choose a heading macro
--% #1 is heading type
--% #2 is heading level
--% #3 is text for heading
--\def\genhead#1#2#3{%
-- % Compute the abs. sec. level:
-- \absseclevel=#2
-- \advance\absseclevel by \secbase
-- % Make sure \absseclevel doesn't fall outside the range:
-- \ifnum \absseclevel < 0
-- \absseclevel = 0
-- \else
-- \ifnum \absseclevel > 3
-- \absseclevel = 3
-- \fi
-- \fi
-- % The heading type:
-- \def\headtype{#1}%
-- \if \headtype U%
-- \ifnum \absseclevel < \unmlevel
-- \chardef\unmlevel = \absseclevel
-- \fi
-- \else
-- % Check for appendix sections:
-- \ifnum \absseclevel = 0
-- \edef\chapheadtype{\headtype}%
-- \else
-- \if \headtype A\if \chapheadtype N%
-- \errmessage{@appendix... within a non-appendix chapter}%
-- \fi\fi
-- \fi
-- % Check for numbered within unnumbered:
-- \ifnum \absseclevel > \unmlevel
-- \def\headtype{U}%
-- \else
-- \chardef\unmlevel = 3
-- \fi
-- \fi
-- % Now print the heading:
-- \if \headtype U%
-- \ifcase\absseclevel
-- \unnumberedzzz{#3}%
-- \or \unnumberedseczzz{#3}%
-- \or \unnumberedsubseczzz{#3}%
-- \or \unnumberedsubsubseczzz{#3}%
-- \fi
-- \else
-- \if \headtype A%
-- \ifcase\absseclevel
-- \appendixzzz{#3}%
-- \or \appendixsectionzzz{#3}%
-- \or \appendixsubseczzz{#3}%
-- \or \appendixsubsubseczzz{#3}%
-- \fi
-- \else
-- \ifcase\absseclevel
-- \chapterzzz{#3}%
-- \or \seczzz{#3}%
-- \or \numberedsubseczzz{#3}%
-- \or \numberedsubsubseczzz{#3}%
-- \fi
-- \fi
-- \fi
-- \suppressfirstparagraphindent
--}
--
--% an interface:
--\def\numhead{\genhead N}
--\def\apphead{\genhead A}
--\def\unnmhead{\genhead U}
--
--% @chapter, @appendix, @unnumbered. Increment top-level counter, reset
--% all lower-level sectioning counters to zero.
--%
--% Also set \chaplevelprefix, which we prepend to @float sequence numbers
--% (e.g., figures), q.v. By default (before any chapter), that is empty.
--\let\chaplevelprefix = \empty
--%
--\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz
--\def\chapterzzz#1{%
-- % section resetting is \global in case the chapter is in a group, such
-- % as an @include file.
-- \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-- \global\advance\chapno by 1
-- %
-- % Used for \float.
-- \gdef\chaplevelprefix{\the\chapno.}%
-- \resetallfloatnos
-- %
-- \message{\putwordChapter\space \the\chapno}%
-- %
-- % Write the actual heading.
-- \chapmacro{#1}{Ynumbered}{\the\chapno}%
-- %
-- % So @section and the like are numbered underneath this chapter.
-- \global\let\section = \numberedsec
-- \global\let\subsection = \numberedsubsec
-- \global\let\subsubsection = \numberedsubsubsec
--}
--
--\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz
--\def\appendixzzz#1{%
-- \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-- \global\advance\appendixno by 1
-- \gdef\chaplevelprefix{\appendixletter.}%
-- \resetallfloatnos
-- %
-- \def\appendixnum{\putwordAppendix\space \appendixletter}%
-- \message{\appendixnum}%
-- %
-- \chapmacro{#1}{Yappendix}{\appendixletter}%
-- %
-- \global\let\section = \appendixsec
-- \global\let\subsection = \appendixsubsec
-- \global\let\subsubsection = \appendixsubsubsec
--}
--
--\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
--\def\unnumberedzzz#1{%
-- \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-- \global\advance\unnumberedno by 1
-- %
-- % Since an unnumbered has no number, no prefix for figures.
-- \global\let\chaplevelprefix = \empty
-- \resetallfloatnos
-- %
-- % This used to be simply \message{#1}, but TeX fully expands the
-- % argument to \message. Therefore, if #1 contained @-commands, TeX
-- % expanded them. For example, in `@unnumbered The @cite{Book}', TeX
-- % expanded @cite (which turns out to cause errors because \cite is meant
-- % to be executed, not expanded).
-- %
-- % Anyway, we don't want the fully-expanded definition of @cite to appear
-- % as a result of the \message, we just want `@cite' itself. We use
-- % \the<toks register> to achieve this: TeX expands \the<toks> only once,
-- % simply yielding the contents of <toks register>. (We also do this for
-- % the toc entries.)
-- \toks0 = {#1}%
-- \message{(\the\toks0)}%
-- %
-- \chapmacro{#1}{Ynothing}{\the\unnumberedno}%
-- %
-- \global\let\section = \unnumberedsec
-- \global\let\subsection = \unnumberedsubsec
-- \global\let\subsubsection = \unnumberedsubsubsec
--}
--
--% @centerchap is like @unnumbered, but the heading is centered.
--\outer\parseargdef\centerchap{%
-- % Well, we could do the following in a group, but that would break
-- % an assumption that \chapmacro is called at the outermost level.
-- % Thus we are safer this way: --kasal, 24feb04
-- \let\centerparametersmaybe = \centerparameters
-- \unnmhead0{#1}%
-- \let\centerparametersmaybe = \relax
--}
--
--% @top is like @unnumbered.
--\let\top\unnumbered
--
--% Sections.
--\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
--\def\seczzz#1{%
-- \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1
-- \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
--}
--
--\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz
--\def\appendixsectionzzz#1{%
-- \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1
-- \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
--}
--\let\appendixsec\appendixsection
--
--\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz
--\def\unnumberedseczzz#1{%
-- \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1
-- \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
--}
--
--% Subsections.
--\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz
--\def\numberedsubseczzz#1{%
-- \global\subsubsecno=0 \global\advance\subsecno by 1
-- \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
--}
--
--\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz
--\def\appendixsubseczzz#1{%
-- \global\subsubsecno=0 \global\advance\subsecno by 1
-- \sectionheading{#1}{subsec}{Yappendix}%
-- {\appendixletter.\the\secno.\the\subsecno}%
--}
--
--\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
--\def\unnumberedsubseczzz#1{%
-- \global\subsubsecno=0 \global\advance\subsecno by 1
-- \sectionheading{#1}{subsec}{Ynothing}%
-- {\the\unnumberedno.\the\secno.\the\subsecno}%
--}
--
--% Subsubsections.
--\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz
--\def\numberedsubsubseczzz#1{%
-- \global\advance\subsubsecno by 1
-- \sectionheading{#1}{subsubsec}{Ynumbered}%
-- {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
--}
--
--\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz
--\def\appendixsubsubseczzz#1{%
-- \global\advance\subsubsecno by 1
-- \sectionheading{#1}{subsubsec}{Yappendix}%
-- {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
--}
--
--\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
--\def\unnumberedsubsubseczzz#1{%
-- \global\advance\subsubsecno by 1
-- \sectionheading{#1}{subsubsec}{Ynothing}%
-- {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}%
--}
--
--% These macros control what the section commands do, according
--% to what kind of chapter we are in (ordinary, appendix, or unnumbered).
--% Define them by default for a numbered chapter.
--\let\section = \numberedsec
--\let\subsection = \numberedsubsec
--\let\subsubsection = \numberedsubsubsec
--
--% Define @majorheading, @heading and @subheading
--
--% NOTE on use of \vbox for chapter headings, section headings, and such:
--% 1) We use \vbox rather than the earlier \line to permit
--% overlong headings to fold.
--% 2) \hyphenpenalty is set to 10000 because hyphenation in a
--% heading is obnoxious; this forbids it.
--% 3) Likewise, headings look best if no \parindent is used, and
--% if justification is not attempted. Hence \raggedright.
--
--
--\def\majorheading{%
-- {\advance\chapheadingskip by 10pt \chapbreak }%
-- \parsearg\chapheadingzzz
--}
--
--\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
--\def\chapheadingzzz#1{%
-- {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-- \parindent=0pt\raggedright
-- \rm #1\hfill}}%
-- \bigskip \par\penalty 200\relax
-- \suppressfirstparagraphindent
--}
--
--% @heading, @subheading, @subsubheading.
--\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{}
-- \suppressfirstparagraphindent}
--\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{}
-- \suppressfirstparagraphindent}
--\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{}
-- \suppressfirstparagraphindent}
--
--% These macros generate a chapter, section, etc. heading only
--% (including whitespace, linebreaking, etc. around it),
--% given all the information in convenient, parsed form.
--
--%%% Args are the skip and penalty (usually negative)
--\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
--
--%%% Define plain chapter starts, and page on/off switching for it
--% Parameter controlling skip before chapter headings (if needed)
--
--\newskip\chapheadingskip
--
--\def\chapbreak{\dobreak \chapheadingskip {-4000}}
--\def\chappager{\par\vfill\supereject}
--\def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
--
--\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
--
--\def\CHAPPAGoff{%
--\global\let\contentsalignmacro = \chappager
--\global\let\pchapsepmacro=\chapbreak
--\global\let\pagealignmacro=\chappager}
--
--\def\CHAPPAGon{%
--\global\let\contentsalignmacro = \chappager
--\global\let\pchapsepmacro=\chappager
--\global\let\pagealignmacro=\chappager
--\global\def\HEADINGSon{\HEADINGSsingle}}
--
--\def\CHAPPAGodd{%
--\global\let\contentsalignmacro = \chapoddpage
--\global\let\pchapsepmacro=\chapoddpage
--\global\let\pagealignmacro=\chapoddpage
--\global\def\HEADINGSon{\HEADINGSdouble}}
--
--\CHAPPAGon
--
--% Chapter opening.
--%
--% #1 is the text, #2 is the section type (Ynumbered, Ynothing,
--% Yappendix, Yomitfromtoc), #3 the chapter number.
--%
--% To test against our argument.
--\def\Ynothingkeyword{Ynothing}
--\def\Yomitfromtockeyword{Yomitfromtoc}
--\def\Yappendixkeyword{Yappendix}
--%
--\def\chapmacro#1#2#3{%
-- \pchapsepmacro
-- {%
-- \chapfonts \rm
-- %
-- % Have to define \thissection before calling \donoderef, because the
-- % xref code eventually uses it. On the other hand, it has to be called
-- % after \pchapsepmacro, or the headline will change too soon.
-- \gdef\thissection{#1}%
-- \gdef\thischaptername{#1}%
-- %
-- % Only insert the separating space if we have a chapter/appendix
-- % number, and don't print the unnumbered ``number''.
-- \def\temptype{#2}%
-- \ifx\temptype\Ynothingkeyword
-- \setbox0 = \hbox{}%
-- \def\toctype{unnchap}%
-- \gdef\thischapternum{}%
-- \gdef\thischapter{#1}%
-- \else\ifx\temptype\Yomitfromtockeyword
-- \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
-- \def\toctype{omit}%
-- \gdef\thischapternum{}%
-- \gdef\thischapter{}%
-- \else\ifx\temptype\Yappendixkeyword
-- \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
-- \def\toctype{app}%
-- \xdef\thischapternum{\appendixletter}%
-- % We don't substitute the actual chapter name into \thischapter
-- % because we don't want its macros evaluated now. And we don't
-- % use \thissection because that changes with each section.
-- %
-- \xdef\thischapter{\putwordAppendix{} \appendixletter:
-- \noexpand\thischaptername}%
-- \else
-- \setbox0 = \hbox{#3\enspace}%
-- \def\toctype{numchap}%
-- \xdef\thischapternum{\the\chapno}%
-- \xdef\thischapter{\putwordChapter{} \the\chapno:
-- \noexpand\thischaptername}%
-- \fi\fi\fi
-- %
-- % Write the toc entry for this chapter. Must come before the
-- % \donoderef, because we include the current node name in the toc
-- % entry, and \donoderef resets it to empty.
-- \writetocentry{\toctype}{#1}{#3}%
-- %
-- % For pdftex, we have to write out the node definition (aka, make
-- % the pdfdest) after any page break, but before the actual text has
-- % been typeset. If the destination for the pdf outline is after the
-- % text, then jumping from the outline may wind up with the text not
-- % being visible, for instance under high magnification.
-- \donoderef{#2}%
-- %
-- % Typeset the actual heading.
-- \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-- \hangindent=\wd0 \centerparametersmaybe
-- \unhbox0 #1\par}%
-- }%
-- \nobreak\bigskip % no page break after a chapter title
-- \nobreak
--}
--
--% @centerchap -- centered and unnumbered.
--\let\centerparametersmaybe = \relax
--\def\centerparameters{%
-- \advance\rightskip by 3\rightskip
-- \leftskip = \rightskip
-- \parfillskip = 0pt
--}
--
--
--% I don't think this chapter style is supported any more, so I'm not
--% updating it with the new noderef stuff. We'll see. --karl, 11aug03.
--%
--\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
--%
--\def\unnchfopen #1{%
--\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-- \parindent=0pt\raggedright
-- \rm #1\hfill}}\bigskip \par\nobreak
--}
--\def\chfopen #1#2{\chapoddpage {\chapfonts
--\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
--\par\penalty 5000 %
--}
--\def\centerchfopen #1{%
--\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-- \parindent=0pt
-- \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
--}
--\def\CHAPFopen{%
-- \global\let\chapmacro=\chfopen
-- \global\let\centerchapmacro=\centerchfopen}
--
--
--% Section titles. These macros combine the section number parts and
--% call the generic \sectionheading to do the printing.
--%
--\newskip\secheadingskip
--\def\secheadingbreak{\dobreak \secheadingskip{-1000}}
--
--% Subsection titles.
--\newskip\subsecheadingskip
--\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}}
--
--% Subsubsection titles.
--\def\subsubsecheadingskip{\subsecheadingskip}
--\def\subsubsecheadingbreak{\subsecheadingbreak}
--
--
--% Print any size, any type, section title.
--%
--% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is
--% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
--% section number.
--%
--\def\sectionheading#1#2#3#4{%
-- {%
-- % Switch to the right set of fonts.
-- \csname #2fonts\endcsname \rm
-- %
-- % Insert space above the heading.
-- \csname #2headingbreak\endcsname
-- %
-- % Only insert the space after the number if we have a section number.
-- \def\sectionlevel{#2}%
-- \def\temptype{#3}%
-- %
-- \ifx\temptype\Ynothingkeyword
-- \setbox0 = \hbox{}%
-- \def\toctype{unn}%
-- \gdef\thissection{#1}%
-- \else\ifx\temptype\Yomitfromtockeyword
-- % for @headings -- no section number, don't include in toc,
-- % and don't redefine \thissection.
-- \setbox0 = \hbox{}%
-- \def\toctype{omit}%
-- \let\sectionlevel=\empty
-- \else\ifx\temptype\Yappendixkeyword
-- \setbox0 = \hbox{#4\enspace}%
-- \def\toctype{app}%
-- \gdef\thissection{#1}%
-- \else
-- \setbox0 = \hbox{#4\enspace}%
-- \def\toctype{num}%
-- \gdef\thissection{#1}%
-- \fi\fi\fi
-- %
-- % Write the toc entry (before \donoderef). See comments in \chapmacro.
-- \writetocentry{\toctype\sectionlevel}{#1}{#4}%
-- %
-- % Write the node reference (= pdf destination for pdftex).
-- % Again, see comments in \chapmacro.
-- \donoderef{#3}%
-- %
-- % Interline glue will be inserted when the vbox is completed.
-- % That glue will be a valid breakpoint for the page, since it'll be
-- % preceded by a whatsit (usually from the \donoderef, or from the
-- % \writetocentry if there was no node). We don't want to allow that
-- % break, since then the whatsits could end up on page n while the
-- % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000.
-- \nobreak
-- %
-- % Output the actual section heading.
-- \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-- \hangindent=\wd0 % zero if no section number
-- \unhbox0 #1}%
-- }%
-- % Add extra space after the heading -- half of whatever came above it.
-- % Don't allow stretch, though.
-- \kern .5 \csname #2headingskip\endcsname
-- %
-- % Do not let the kern be a potential breakpoint, as it would be if it
-- % was followed by glue.
-- \nobreak
-- %
-- % We'll almost certainly start a paragraph next, so don't let that
-- % glue accumulate. (Not a breakpoint because it's preceded by a
-- % discardable item.)
-- \vskip-\parskip
-- %
-- % This is purely so the last item on the list is a known \penalty >
-- % 10000. This is so \startdefun can avoid allowing breakpoints after
-- % section headings. Otherwise, it would insert a valid breakpoint between:
-- %
-- % @section sec-whatever
-- % @deffn def-whatever
-- \penalty 10001
--}
--
--
--\message{toc,}
--% Table of contents.
--\newwrite\tocfile
--
--% Write an entry to the toc file, opening it if necessary.
--% Called from @chapter, etc.
--%
--% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno}
--% We append the current node name (if any) and page number as additional
--% arguments for the \{chap,sec,...}entry macros which will eventually
--% read this. The node name is used in the pdf outlines as the
--% destination to jump to.
--%
--% We open the .toc file for writing here instead of at @setfilename (or
--% any other fixed time) so that @contents can be anywhere in the document.
--% But if #1 is `omit', then we don't do anything. This is used for the
--% table of contents chapter openings themselves.
--%
--\newif\iftocfileopened
--\def\omitkeyword{omit}%
--%
--\def\writetocentry#1#2#3{%
-- \edef\writetoctype{#1}%
-- \ifx\writetoctype\omitkeyword \else
-- \iftocfileopened\else
-- \immediate\openout\tocfile = \jobname.toc
-- \global\tocfileopenedtrue
-- \fi
-- %
-- \iflinks
-- {\atdummies
-- \edef\temp{%
-- \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
-- \temp
-- }%
-- \fi
-- \fi
-- %
-- % Tell \shipout to create a pdf destination on each page, if we're
-- % writing pdf. These are used in the table of contents. We can't
-- % just write one on every page because the title pages are numbered
-- % 1 and 2 (the page numbers aren't printed), and so are the first
-- % two pages of the document. Thus, we'd have two destinations named
-- % `1', and two named `2'.
-- \ifpdf \global\pdfmakepagedesttrue \fi
--}
--
--
--% These characters do not print properly in the Computer Modern roman
--% fonts, so we must take special care. This is more or less redundant
--% with the Texinfo input format setup at the end of this file.
--%
--\def\activecatcodes{%
-- \catcode`\"=\active
-- \catcode`\$=\active
-- \catcode`\<=\active
-- \catcode`\>=\active
-- \catcode`\\=\active
-- \catcode`\^=\active
-- \catcode`\_=\active
-- \catcode`\|=\active
-- \catcode`\~=\active
--}
--
--
--% Read the toc file, which is essentially Texinfo input.
--\def\readtocfile{%
-- \setupdatafile
-- \activecatcodes
-- \input \jobname.toc
--}
--
--\newskip\contentsrightmargin \contentsrightmargin=1in
--\newcount\savepageno
--\newcount\lastnegativepageno \lastnegativepageno = -1
--
--% Prepare to read what we've written to \tocfile.
--%
--\def\startcontents#1{%
-- % If @setchapternewpage on, and @headings double, the contents should
-- % start on an odd page, unlike chapters. Thus, we maintain
-- % \contentsalignmacro in parallel with \pagealignmacro.
-- % From: Torbjorn Granlund <tege at matematik.su.se>
-- \contentsalignmacro
-- \immediate\closeout\tocfile
-- %
-- % Don't need to put `Contents' or `Short Contents' in the headline.
-- % It is abundantly clear what they are.
-- \def\thischapter{}%
-- \chapmacro{#1}{Yomitfromtoc}{}%
-- %
-- \savepageno = \pageno
-- \begingroup % Set up to handle contents files properly.
-- \raggedbottom % Worry more about breakpoints than the bottom.
-- \advance\hsize by -\contentsrightmargin % Don't use the full line length.
-- %
-- % Roman numerals for page numbers.
-- \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
--}
--
--
--% Normal (long) toc.
--\def\contents{%
-- \startcontents{\putwordTOC}%
-- \openin 1 \jobname.toc
-- \ifeof 1 \else
-- \readtocfile
-- \fi
-- \vfill \eject
-- \contentsalignmacro % in case @setchapternewpage odd is in effect
-- \ifeof 1 \else
-- \pdfmakeoutlines
-- \fi
-- \closein 1
-- \endgroup
-- \lastnegativepageno = \pageno
-- \global\pageno = \savepageno
--}
--
--% And just the chapters.
--\def\summarycontents{%
-- \startcontents{\putwordShortTOC}%
-- %
-- \let\numchapentry = \shortchapentry
-- \let\appentry = \shortchapentry
-- \let\unnchapentry = \shortunnchapentry
-- % We want a true roman here for the page numbers.
-- \secfonts
-- \let\rm=\shortcontrm \let\bf=\shortcontbf
-- \let\sl=\shortcontsl \let\tt=\shortconttt
-- \rm
-- \hyphenpenalty = 10000
-- \advance\baselineskip by 1pt % Open it up a little.
-- \def\numsecentry##1##2##3##4{}
-- \let\appsecentry = \numsecentry
-- \let\unnsecentry = \numsecentry
-- \let\numsubsecentry = \numsecentry
-- \let\appsubsecentry = \numsecentry
-- \let\unnsubsecentry = \numsecentry
-- \let\numsubsubsecentry = \numsecentry
-- \let\appsubsubsecentry = \numsecentry
-- \let\unnsubsubsecentry = \numsecentry
-- \openin 1 \jobname.toc
-- \ifeof 1 \else
-- \readtocfile
-- \fi
-- \closein 1
-- \vfill \eject
-- \contentsalignmacro % in case @setchapternewpage odd is in effect
-- \endgroup
-- \lastnegativepageno = \pageno
-- \global\pageno = \savepageno
--}
--\let\shortcontents = \summarycontents
--
--% Typeset the label for a chapter or appendix for the short contents.
--% The arg is, e.g., `A' for an appendix, or `3' for a chapter.
--%
--\def\shortchaplabel#1{%
-- % This space should be enough, since a single number is .5em, and the
-- % widest letter (M) is 1em, at least in the Computer Modern fonts.
-- % But use \hss just in case.
-- % (This space doesn't include the extra space that gets added after
-- % the label; that gets put in by \shortchapentry above.)
-- %
-- % We'd like to right-justify chapter numbers, but that looks strange
-- % with appendix letters. And right-justifying numbers and
-- % left-justifying letters looks strange when there is less than 10
-- % chapters. Have to read the whole toc once to know how many chapters
-- % there are before deciding ...
-- \hbox to 1em{#1\hss}%
--}
--
--% These macros generate individual entries in the table of contents.
--% The first argument is the chapter or section name.
--% The last argument is the page number.
--% The arguments in between are the chapter number, section number, ...
--
--% Chapters, in the main contents.
--\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
--%
--% Chapters, in the short toc.
--% See comments in \dochapentry re vbox and related settings.
--\def\shortchapentry#1#2#3#4{%
-- \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}%
--}
--
--% Appendices, in the main contents.
--% Need the word Appendix, and a fixed-size box.
--%
--\def\appendixbox#1{%
-- % We use M since it's probably the widest letter.
-- \setbox0 = \hbox{\putwordAppendix{} M}%
-- \hbox to \wd0{\putwordAppendix{} #1\hss}}
--%
--\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}}
--
--% Unnumbered chapters.
--\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
--\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}}
--
--% Sections.
--\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}}
--\let\appsecentry=\numsecentry
--\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}}
--
--% Subsections.
--\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}}
--\let\appsubsecentry=\numsubsecentry
--\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}}
--
--% And subsubsections.
--\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}}
--\let\appsubsubsecentry=\numsubsubsecentry
--\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
--
--% This parameter controls the indentation of the various levels.
--% Same as \defaultparindent.
--\newdimen\tocindent \tocindent = 15pt
--
--% Now for the actual typesetting. In all these, #1 is the text and #2 is the
--% page number.
--%
--% If the toc has to be broken over pages, we want it to be at chapters
--% if at all possible; hence the \penalty.
--\def\dochapentry#1#2{%
-- \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip
-- \begingroup
-- \chapentryfonts
-- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
-- \endgroup
-- \nobreak\vskip .25\baselineskip plus.1\baselineskip
--}
--
--\def\dosecentry#1#2{\begingroup
-- \secentryfonts \leftskip=\tocindent
-- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
--\endgroup}
--
--\def\dosubsecentry#1#2{\begingroup
-- \subsecentryfonts \leftskip=2\tocindent
-- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
--\endgroup}
--
--\def\dosubsubsecentry#1#2{\begingroup
-- \subsubsecentryfonts \leftskip=3\tocindent
-- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
--\endgroup}
--
--% We use the same \entry macro as for the index entries.
--\let\tocentry = \entry
--
--% Space between chapter (or whatever) number and the title.
--\def\labelspace{\hskip1em \relax}
--
--\def\dopageno#1{{\rm #1}}
--\def\doshortpageno#1{{\rm #1}}
--
--\def\chapentryfonts{\secfonts \rm}
--\def\secentryfonts{\textfonts}
--\def\subsecentryfonts{\textfonts}
--\def\subsubsecentryfonts{\textfonts}
--
--
--\message{environments,}
--% @foo ... @end foo.
--
--% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
--%
--% Since these characters are used in examples, it should be an even number of
--% \tt widths. Each \tt character is 1en, so two makes it 1em.
--%
--\def\point{$\star$}
--\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
--\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
--\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
--\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
--
--% The @error{} command.
--% Adapted from the TeXbook's \boxit.
--%
--\newbox\errorbox
--%
--{\tentt \global\dimen0 = 3em}% Width of the box.
--\dimen2 = .55pt % Thickness of rules
--% The text. (`r' is open on the right, `e' somewhat less so on the left.)
--\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
--%
--\setbox\errorbox=\hbox to \dimen0{\hfil
-- \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
-- \advance\hsize by -2\dimen2 % Rules.
-- \vbox{%
-- \hrule height\dimen2
-- \hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
-- \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
-- \kern3pt\vrule width\dimen2}% Space to right.
-- \hrule height\dimen2}
-- \hfil}
--%
--\def\error{\leavevmode\lower.7ex\copy\errorbox}
--
--% @tex ... @end tex escapes into raw Tex temporarily.
--% One exception: @ is still an escape character, so that @end tex works.
--% But \@ or @@ will get a plain tex @ character.
--
--\envdef\tex{%
-- \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
-- \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
-- \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
-- \catcode `\%=14
-- \catcode `\+=\other
-- \catcode `\"=\other
-- \catcode `\|=\other
-- \catcode `\<=\other
-- \catcode `\>=\other
-- \escapechar=`\\
-- %
-- \let\b=\ptexb
-- \let\bullet=\ptexbullet
-- \let\c=\ptexc
-- \let\,=\ptexcomma
-- \let\.=\ptexdot
-- \let\dots=\ptexdots
-- \let\equiv=\ptexequiv
-- \let\!=\ptexexclam
-- \let\i=\ptexi
-- \let\indent=\ptexindent
-- \let\noindent=\ptexnoindent
-- \let\{=\ptexlbrace
-- \let\+=\tabalign
-- \let\}=\ptexrbrace
-- \let\/=\ptexslash
-- \let\*=\ptexstar
-- \let\t=\ptext
-- \let\frenchspacing=\plainfrenchspacing
-- %
-- \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
-- \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
-- \def\@{@}%
--}
--% There is no need to define \Etex.
--
--% Define @lisp ... @end lisp.
--% @lisp environment forms a group so it can rebind things,
--% including the definition of @end lisp (which normally is erroneous).
--
--% Amount to narrow the margins by for @lisp.
--\newskip\lispnarrowing \lispnarrowing=0.4in
--
--% This is the definition that ^^M gets inside @lisp, @example, and other
--% such environments. \null is better than a space, since it doesn't
--% have any width.
--\def\lisppar{\null\endgraf}
--
--% This space is always present above and below environments.
--\newskip\envskipamount \envskipamount = 0pt
--
--% Make spacing and below environment symmetrical. We use \parskip here
--% to help in doing that, since in @example-like environments \parskip
--% is reset to zero; thus the \afterenvbreak inserts no space -- but the
--% start of the next paragraph will insert \parskip.
--%
--\def\aboveenvbreak{{%
-- % =10000 instead of <10000 because of a special case in \itemzzz and
-- % \sectionheading, q.v.
-- \ifnum \lastpenalty=10000 \else
-- \advance\envskipamount by \parskip
-- \endgraf
-- \ifdim\lastskip<\envskipamount
-- \removelastskip
-- % it's not a good place to break if the last penalty was \nobreak
-- % or better ...
-- \ifnum\lastpenalty<10000 \penalty-50 \fi
-- \vskip\envskipamount
-- \fi
-- \fi
--}}
--
--\let\afterenvbreak = \aboveenvbreak
--
--% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will
--% also clear it, so that its embedded environments do the narrowing again.
--\let\nonarrowing=\relax
--
--% @cartouche ... @end cartouche: draw rectangle w/rounded corners around
--% environment contents.
--\font\circle=lcircle10
--\newdimen\circthick
--\newdimen\cartouter\newdimen\cartinner
--\newskip\normbskip\newskip\normpskip\newskip\normlskip
--\circthick=\fontdimen8\circle
--%
--\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
--\def\ctr{{\hskip 6pt\circle\char'010}}
--\def\cbl{{\circle\char'012\hskip -6pt}}
--\def\cbr{{\hskip 6pt\circle\char'011}}
--\def\carttop{\hbox to \cartouter{\hskip\lskip
-- \ctl\leaders\hrule height\circthick\hfil\ctr
-- \hskip\rskip}}
--\def\cartbot{\hbox to \cartouter{\hskip\lskip
-- \cbl\leaders\hrule height\circthick\hfil\cbr
-- \hskip\rskip}}
--%
--\newskip\lskip\newskip\rskip
--
--\envdef\cartouche{%
-- \ifhmode\par\fi % can't be in the midst of a paragraph.
-- \startsavinginserts
-- \lskip=\leftskip \rskip=\rightskip
-- \leftskip=0pt\rightskip=0pt % we want these *outside*.
-- \cartinner=\hsize \advance\cartinner by-\lskip
-- \advance\cartinner by-\rskip
-- \cartouter=\hsize
-- \advance\cartouter by 18.4pt % allow for 3pt kerns on either
-- % side, and for 6pt waste from
-- % each corner char, and rule thickness
-- \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
-- % Flag to tell @lisp, etc., not to narrow margin.
-- \let\nonarrowing = t%
-- \vbox\bgroup
-- \baselineskip=0pt\parskip=0pt\lineskip=0pt
-- \carttop
-- \hbox\bgroup
-- \hskip\lskip
-- \vrule\kern3pt
-- \vbox\bgroup
-- \kern3pt
-- \hsize=\cartinner
-- \baselineskip=\normbskip
-- \lineskip=\normlskip
-- \parskip=\normpskip
-- \vskip -\parskip
-- \comment % For explanation, see the end of \def\group.
--}
--\def\Ecartouche{%
-- \ifhmode\par\fi
-- \kern3pt
-- \egroup
-- \kern3pt\vrule
-- \hskip\rskip
-- \egroup
-- \cartbot
-- \egroup
-- \checkinserts
--}
--
--
--% This macro is called at the beginning of all the @example variants,
--% inside a group.
--\def\nonfillstart{%
-- \aboveenvbreak
-- \hfuzz = 12pt % Don't be fussy
-- \sepspaces % Make spaces be word-separators rather than space tokens.
-- \let\par = \lisppar % don't ignore blank lines
-- \obeylines % each line of input is a line of output
-- \parskip = 0pt
-- \parindent = 0pt
-- \emergencystretch = 0pt % don't try to avoid overfull boxes
-- \ifx\nonarrowing\relax
-- \advance \leftskip by \lispnarrowing
-- \exdentamount=\lispnarrowing
-- \else
-- \let\nonarrowing = \relax
-- \fi
-- \let\exdent=\nofillexdent
--}
--
--% If you want all examples etc. small: @set dispenvsize small.
--% If you want even small examples the full size: @set dispenvsize nosmall.
--% This affects the following displayed environments:
--% @example, @display, @format, @lisp
--%
--\def\smallword{small}
--\def\nosmallword{nosmall}
--\let\SETdispenvsize\relax
--\def\setnormaldispenv{%
-- \ifx\SETdispenvsize\smallword
-- % end paragraph for sake of leading, in case document has no blank
-- % line. This is redundant with what happens in \aboveenvbreak, but
-- % we need to do it before changing the fonts, and it's inconvenient
-- % to change the fonts afterward.
-- \ifnum \lastpenalty=10000 \else \endgraf \fi
-- \smallexamplefonts \rm
-- \fi
--}
--\def\setsmalldispenv{%
-- \ifx\SETdispenvsize\nosmallword
-- \else
-- \ifnum \lastpenalty=10000 \else \endgraf \fi
-- \smallexamplefonts \rm
-- \fi
--}
--
--% We often define two environments, @foo and @smallfoo.
--% Let's do it by one command:
--\def\makedispenv #1#2{
-- \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
-- \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
-- \expandafter\let\csname E#1\endcsname \afterenvbreak
-- \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
--}
--
--% Define two synonyms:
--\def\maketwodispenvs #1#2#3{
-- \makedispenv{#1}{#3}
-- \makedispenv{#2}{#3}
--}
--
--% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
--%
--% @smallexample and @smalllisp: use smaller fonts.
--% Originally contributed by Pavel at xerox.
--%
--\maketwodispenvs {lisp}{example}{%
-- \nonfillstart
-- \tt\quoteexpand
-- \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-- \gobble % eat return
--}
--% @display/@smalldisplay: same as @lisp except keep current font.
--%
--\makedispenv {display}{%
-- \nonfillstart
-- \gobble
--}
--
--% @format/@smallformat: same as @display except don't narrow margins.
--%
--\makedispenv{format}{%
-- \let\nonarrowing = t%
-- \nonfillstart
-- \gobble
--}
--
--% @flushleft: same as @format, but doesn't obey \SETdispenvsize.
--\envdef\flushleft{%
-- \let\nonarrowing = t%
-- \nonfillstart
-- \gobble
--}
--\let\Eflushleft = \afterenvbreak
--
--% @flushright.
--%
--\envdef\flushright{%
-- \let\nonarrowing = t%
-- \nonfillstart
-- \advance\leftskip by 0pt plus 1fill
-- \gobble
--}
--\let\Eflushright = \afterenvbreak
--
--
--% @quotation does normal linebreaking (hence we can't use \nonfillstart)
--% and narrows the margins. We keep \parskip nonzero in general, since
--% we're doing normal filling. So, when using \aboveenvbreak and
--% \afterenvbreak, temporarily make \parskip 0.
--%
--\envdef\quotation{%
-- {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-- \parindent=0pt
-- %
-- % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
-- \ifx\nonarrowing\relax
-- \advance\leftskip by \lispnarrowing
-- \advance\rightskip by \lispnarrowing
-- \exdentamount = \lispnarrowing
-- \else
-- \let\nonarrowing = \relax
-- \fi
-- \parsearg\quotationlabel
--}
--
--% We have retained a nonzero parskip for the environment, since we're
--% doing normal filling.
--%
--\def\Equotation{%
-- \par
-- \ifx\quotationauthor\undefined\else
-- % indent a bit.
-- \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
-- \fi
-- {\parskip=0pt \afterenvbreak}%
--}
--
--% If we're given an argument, typeset it in bold with a colon after.
--\def\quotationlabel#1{%
-- \def\temp{#1}%
-- \ifx\temp\empty \else
-- {\bf #1: }%
-- \fi
--}
--
--
--% LaTeX-like @verbatim... at end verbatim and @verb{<char>...<char>}
--% If we want to allow any <char> as delimiter,
--% we need the curly braces so that makeinfo sees the @verb command, eg:
--% `@verbx...x' would look like the '@verbx' command. --janneke at gnu.org
--%
--% [Knuth]: Donald Ervin Knuth, 1996. The TeXbook.
--%
--% [Knuth] p.344; only we need to do the other characters Texinfo sets
--% active too. Otherwise, they get lost as the first character on a
--% verbatim line.
--\def\dospecials{%
-- \do\ \do\\\do\{\do\}\do\$\do\&%
-- \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
-- \do\<\do\>\do\|\do\@\do+\do\"%
--}
--%
--% [Knuth] p. 380
--\def\uncatcodespecials{%
-- \def\do##1{\catcode`##1=\other}\dospecials}
--%
--% [Knuth] pp. 380,381,391
--% Disable Spanish ligatures ?` and !` of \tt font
--\begingroup
-- \catcode`\`=\active\gdef`{\relax\lq}
--\endgroup
--%
--% Setup for the @verb command.
--%
--% Eight spaces for a tab
--\begingroup
-- \catcode`\^^I=\active
-- \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }}
--\endgroup
--%
--\def\setupverb{%
-- \tt % easiest (and conventionally used) font for verbatim
-- \def\par{\leavevmode\endgraf}%
-- \catcode`\`=\active
-- \tabeightspaces
-- % Respect line breaks,
-- % print special symbols as themselves, and
-- % make each space count
-- % must do in this order:
-- \obeylines \uncatcodespecials \sepspaces
--}
--
--% Setup for the @verbatim environment
--%
--% Real tab expansion
--\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
--%
--\def\starttabbox{\setbox0=\hbox\bgroup}
--
--% Allow an option to not replace quotes with a regular directed right
--% quote/apostrophe (char 0x27), but instead use the undirected quote
--% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
--% the default, but it works for pasting with more pdf viewers (at least
--% evince), the lilypond developers report. xpdf does work with the
--% regular 0x27.
--%
--\def\codequoteright{%
-- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
-- '%
-- \else
-- \char'15
-- \fi
--}
--%
--% and a similar option for the left quote char vs. a grave accent.
--% Modern fonts display ASCII 0x60 as a grave accent, so some people like
--% the code environments to do likewise.
--%
--\def\codequoteleft{%
-- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
-- `%
-- \else
-- \char'22
-- \fi
--}
--%
--\begingroup
-- \catcode`\^^I=\active
-- \gdef\tabexpand{%
-- \catcode`\^^I=\active
-- \def^^I{\leavevmode\egroup
-- \dimen0=\wd0 % the width so far, or since the previous tab
-- \divide\dimen0 by\tabw
-- \multiply\dimen0 by\tabw % compute previous multiple of \tabw
-- \advance\dimen0 by\tabw % advance to next multiple of \tabw
-- \wd0=\dimen0 \box0 \starttabbox
-- }%
-- }
-- \catcode`\'=\active
-- \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
-- %
-- \catcode`\`=\active
-- \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
-- %
-- \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
--\endgroup
--
--% start the verbatim environment.
--\def\setupverbatim{%
-- \let\nonarrowing = t%
-- \nonfillstart
-- % Easiest (and conventionally used) font for verbatim
-- \tt
-- \def\par{\leavevmode\egroup\box0\endgraf}%
-- \catcode`\`=\active
-- \tabexpand
-- \quoteexpand
-- % Respect line breaks,
-- % print special symbols as themselves, and
-- % make each space count
-- % must do in this order:
-- \obeylines \uncatcodespecials \sepspaces
-- \everypar{\starttabbox}%
--}
--
--% Do the @verb magic: verbatim text is quoted by unique
--% delimiter characters. Before first delimiter expect a
--% right brace, after last delimiter expect closing brace:
--%
--% \def\doverb'{'<char>#1<char>'}'{#1}
--%
--% [Knuth] p. 382; only eat outer {}
--\begingroup
-- \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other
-- \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next]
--\endgroup
--%
--\def\verb{\begingroup\setupverb\doverb}
--%
--%
--% Do the @verbatim magic: define the macro \doverbatim so that
--% the (first) argument ends when '@end verbatim' is reached, ie:
--%
--% \def\doverbatim#1 at end verbatim{#1}
--%
--% For Texinfo it's a lot easier than for LaTeX,
--% because texinfo's \verbatim doesn't stop at '\end{verbatim}':
--% we need not redefine '\', '{' and '}'.
--%
--% Inspired by LaTeX's verbatim command set [latex.ltx]
--%
--\begingroup
-- \catcode`\ =\active
-- \obeylines %
-- % ignore everything up to the first ^^M, that's the newline at the end
-- % of the @verbatim input line itself. Otherwise we get an extra blank
-- % line in the output.
-- \xdef\doverbatim#1^^M#2 at end verbatim{#2\noexpand\end\gobble verbatim}%
-- % We really want {...\end verbatim} in the body of the macro, but
-- % without the active space; thus we have to use \xdef and \gobble.
--\endgroup
--%
--\envdef\verbatim{%
-- \setupverbatim\doverbatim
--}
--\let\Everbatim = \afterenvbreak
--
--
--% @verbatiminclude FILE - insert text of file in verbatim environment.
--%
--\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude}
--%
--\def\doverbatiminclude#1{%
-- {%
-- \makevalueexpandable
-- \setupverbatim
-- \input #1
-- \afterenvbreak
-- }%
--}
--
--% @copying ... @end copying.
--% Save the text away for @insertcopying later.
--%
--% We save the uninterpreted tokens, rather than creating a box.
--% Saving the text in a box would be much easier, but then all the
--% typesetting commands (@smallbook, font changes, etc.) have to be done
--% beforehand -- and a) we want @copying to be done first in the source
--% file; b) letting users define the frontmatter in as flexible order as
--% possible is very desirable.
--%
--\def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
--\def\docopying#1 at end copying{\endgroup\def\copyingtext{#1}}
--%
--\def\insertcopying{%
-- \begingroup
-- \parindent = 0pt % paragraph indentation looks wrong on title page
-- \scanexp\copyingtext
-- \endgroup
--}
--
--
--\message{defuns,}
--% @defun etc.
--
--\newskip\defbodyindent \defbodyindent=.4in
--\newskip\defargsindent \defargsindent=50pt
--\newskip\deflastargmargin \deflastargmargin=18pt
--\newcount\defunpenalty
--
--% Start the processing of @deffn:
--\def\startdefun{%
-- \ifnum\lastpenalty<10000
-- \medbreak
-- \defunpenalty=10003 % Will keep this @deffn together with the
-- % following @def command, see below.
-- \else
-- % If there are two @def commands in a row, we'll have a \nobreak,
-- % which is there to keep the function description together with its
-- % header. But if there's nothing but headers, we need to allow a
-- % break somewhere. Check specifically for penalty 10002, inserted
-- % by \printdefunline, instead of 10000, since the sectioning
-- % commands also insert a nobreak penalty, and we don't want to allow
-- % a break between a section heading and a defun.
-- %
-- % As a minor refinement, we avoid "club" headers by signalling
-- % with penalty of 10003 after the very first @deffn in the
-- % sequence (see above), and penalty of 10002 after any following
-- % @def command.
-- \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi
-- %
-- % Similarly, after a section heading, do not allow a break.
-- % But do insert the glue.
-- \medskip % preceded by discardable penalty, so not a breakpoint
-- \fi
-- %
-- \parindent=0in
-- \advance\leftskip by \defbodyindent
-- \exdentamount=\defbodyindent
--}
--
--\def\dodefunx#1{%
-- % First, check whether we are in the right environment:
-- \checkenv#1%
-- %
-- % As above, allow line break if we have multiple x headers in a row.
-- % It's not a great place, though.
-- \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
-- %
-- % And now, it's time to reuse the body of the original defun:
-- \expandafter\gobbledefun#1%
--}
--\def\gobbledefun#1\startdefun{}
--
--% \printdefunline \deffnheader{text}
--%
--\def\printdefunline#1#2{%
-- \begingroup
-- % call \deffnheader:
-- #1#2 \endheader
-- % common ending:
-- \interlinepenalty = 10000
-- \advance\rightskip by 0pt plus 1fil
-- \endgraf
-- \nobreak\vskip -\parskip
-- \penalty\defunpenalty % signal to \startdefun and \dodefunx
-- % Some of the @defun-type tags do not enable magic parentheses,
-- % rendering the following check redundant. But we don't optimize.
-- \checkparencounts
-- \endgroup
--}
--
--\def\Edefun{\endgraf\medbreak}
--
--% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
--% the only thing remainnig is to define \deffnheader.
--%
--\def\makedefun#1{%
-- \expandafter\let\csname E#1\endcsname = \Edefun
-- \edef\temp{\noexpand\domakedefun
-- \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}%
-- \temp
--}
--
--% \domakedefun \deffn \deffnx \deffnheader
--%
--% Define \deffn and \deffnx, without parameters.
--% \deffnheader has to be defined explicitly.
--%
--\def\domakedefun#1#2#3{%
-- \envdef#1{%
-- \startdefun
-- \parseargusing\activeparens{\printdefunline#3}%
-- }%
-- \def#2{\dodefunx#1}%
-- \def#3%
--}
--
--%%% Untyped functions:
--
--% @deffn category name args
--\makedefun{deffn}{\deffngeneral{}}
--
--% @deffn category class name args
--\makedefun{defop}#1 {\defopon{#1\ \putwordon}}
--
--% \defopon {category on}class name args
--\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
--
--% \deffngeneral {subind}category name args
--%
--\def\deffngeneral#1#2 #3 #4\endheader{%
-- % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
-- \dosubind{fn}{\code{#3}}{#1}%
-- \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
--}
--
--%%% Typed functions:
--
--% @deftypefn category type name args
--\makedefun{deftypefn}{\deftypefngeneral{}}
--
--% @deftypeop category class type name args
--\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}}
--
--% \deftypeopon {category on}class type name args
--\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
--
--% \deftypefngeneral {subind}category type name args
--%
--\def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
-- \dosubind{fn}{\code{#4}}{#1}%
-- \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
--}
--
--%%% Typed variables:
--
--% @deftypevr category type var args
--\makedefun{deftypevr}{\deftypecvgeneral{}}
--
--% @deftypecv category class type var args
--\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}}
--
--% \deftypecvof {category of}class type var args
--\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} }
--
--% \deftypecvgeneral {subind}category type var args
--%
--\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{%
-- \dosubind{vr}{\code{#4}}{#1}%
-- \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
--}
--
--%%% Untyped variables:
--
--% @defvr category var args
--\makedefun{defvr}#1 {\deftypevrheader{#1} {} }
--
--% @defcv category class var args
--\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}}
--
--% \defcvof {category of}class var args
--\def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
--
--%%% Type:
--% @deftp category name args
--\makedefun{deftp}#1 #2 #3\endheader{%
-- \doind{tp}{\code{#2}}%
-- \defname{#1}{}{#2}\defunargs{#3\unskip}%
--}
--
--% Remaining @defun-like shortcuts:
--\makedefun{defun}{\deffnheader{\putwordDeffunc} }
--\makedefun{defmac}{\deffnheader{\putwordDefmac} }
--\makedefun{defspec}{\deffnheader{\putwordDefspec} }
--\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} }
--\makedefun{defvar}{\defvrheader{\putwordDefvar} }
--\makedefun{defopt}{\defvrheader{\putwordDefopt} }
--\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} }
--\makedefun{defmethod}{\defopon\putwordMethodon}
--\makedefun{deftypemethod}{\deftypeopon\putwordMethodon}
--\makedefun{defivar}{\defcvof\putwordInstanceVariableof}
--\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof}
--
--% \defname, which formats the name of the @def (not the args).
--% #1 is the category, such as "Function".
--% #2 is the return type, if any.
--% #3 is the function name.
--%
--% We are followed by (but not passed) the arguments, if any.
--%
--\def\defname#1#2#3{%
-- % Get the values of \leftskip and \rightskip as they were outside the @def...
-- \advance\leftskip by -\defbodyindent
-- %
-- % How we'll format the type name. Putting it in brackets helps
-- % distinguish it from the body text that may end up on the next line
-- % just below it.
-- \def\temp{#1}%
-- \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi}
-- %
-- % Figure out line sizes for the paragraph shape.
-- % The first line needs space for \box0; but if \rightskip is nonzero,
-- % we need only space for the part of \box0 which exceeds it:
-- \dimen0=\hsize \advance\dimen0 by -\wd0 \advance\dimen0 by \rightskip
-- % The continuations:
-- \dimen2=\hsize \advance\dimen2 by -\defargsindent
-- % (plain.tex says that \dimen1 should be used only as global.)
-- \parshape 2 0in \dimen0 \defargsindent \dimen2
-- %
-- % Put the type name to the right margin.
-- \noindent
-- \hbox to 0pt{%
-- \hfil\box0 \kern-\hsize
-- % \hsize has to be shortened this way:
-- \kern\leftskip
-- % Intentionally do not respect \rightskip, since we need the space.
-- }%
-- %
-- % Allow all lines to be underfull without complaint:
-- \tolerance=10000 \hbadness=10000
-- \exdentamount=\defbodyindent
-- {%
-- % defun fonts. We use typewriter by default (used to be bold) because:
-- % . we're printing identifiers, they should be in tt in principle.
-- % . in languages with many accents, such as Czech or French, it's
-- % common to leave accents off identifiers. The result looks ok in
-- % tt, but exceedingly strange in rm.
-- % . we don't want -- and --- to be treated as ligatures.
-- % . this still does not fix the ?` and !` ligatures, but so far no
-- % one has made identifiers using them :).
-- \df \tt
-- \def\temp{#2}% return value type
-- \ifx\temp\empty\else \tclose{\temp} \fi
-- #3% output function name
-- }%
-- {\rm\enskip}% hskip 0.5 em of \tenrm
-- %
-- \boldbrax
-- % arguments will be output next, if any.
--}
--
--% Print arguments in slanted roman (not ttsl), inconsistently with using
--% tt for the name. This is because literal text is sometimes needed in
--% the argument list (groff manual), and ttsl and tt are not very
--% distinguishable. Prevent hyphenation at `-' chars.
--%
--\def\defunargs#1{%
-- % use sl by default (not ttsl),
-- % tt for the names.
-- \df \sl \hyphenchar\font=0
-- %
-- % On the other hand, if an argument has two dashes (for instance), we
-- % want a way to get ttsl. Let's try @var for that.
-- \let\var=\ttslanted
-- #1%
-- \sl\hyphenchar\font=45
--}
--
--% We want ()&[] to print specially on the defun line.
--%
--\def\activeparens{%
-- \catcode`\(=\active \catcode`\)=\active
-- \catcode`\[=\active \catcode`\]=\active
-- \catcode`\&=\active
--}
--
--% Make control sequences which act like normal parenthesis chars.
--\let\lparen = ( \let\rparen = )
--
--% Be sure that we always have a definition for `(', etc. For example,
--% if the fn name has parens in it, \boldbrax will not be in effect yet,
--% so TeX would otherwise complain about undefined control sequence.
--{
-- \activeparens
-- \global\let(=\lparen \global\let)=\rparen
-- \global\let[=\lbrack \global\let]=\rbrack
-- \global\let& = \&
--
-- \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
-- \gdef\magicamp{\let&=\amprm}
--}
--
--\newcount\parencount
--
--% If we encounter &foo, then turn on ()-hacking afterwards
--\newif\ifampseen
--\def\amprm#1 {\ampseentrue{\bf\ }}
--
--\def\parenfont{%
-- \ifampseen
-- % At the first level, print parens in roman,
-- % otherwise use the default font.
-- \ifnum \parencount=1 \rm \fi
-- \else
-- % The \sf parens (in \boldbrax) actually are a little bolder than
-- % the contained text. This is especially needed for [ and ] .
-- \sf
-- \fi
--}
--\def\infirstlevel#1{%
-- \ifampseen
-- \ifnum\parencount=1
-- #1%
-- \fi
-- \fi
--}
--\def\bfafterword#1 {#1 \bf}
--
--\def\opnr{%
-- \global\advance\parencount by 1
-- {\parenfont(}%
-- \infirstlevel \bfafterword
--}
--\def\clnr{%
-- {\parenfont)}%
-- \infirstlevel \sl
-- \global\advance\parencount by -1
--}
--
--\newcount\brackcount
--\def\lbrb{%
-- \global\advance\brackcount by 1
-- {\bf[}%
--}
--\def\rbrb{%
-- {\bf]}%
-- \global\advance\brackcount by -1
--}
--
--\def\checkparencounts{%
-- \ifnum\parencount=0 \else \badparencount \fi
-- \ifnum\brackcount=0 \else \badbrackcount \fi
--}
--\def\badparencount{%
-- \errmessage{Unbalanced parentheses in @def}%
-- \global\parencount=0
--}
--\def\badbrackcount{%
-- \errmessage{Unbalanced square braces in @def}%
-- \global\brackcount=0
--}
--
--
--\message{macros,}
--% @macro.
--
--% To do this right we need a feature of e-TeX, \scantokens,
--% which we arrange to emulate with a temporary file in ordinary TeX.
--\ifx\eTeXversion\undefined
-- \newwrite\macscribble
-- \def\scantokens#1{%
-- \toks0={#1}%
-- \immediate\openout\macscribble=\jobname.tmp
-- \immediate\write\macscribble{\the\toks0}%
-- \immediate\closeout\macscribble
-- \input \jobname.tmp
-- }
--\fi
--
--\def\scanmacro#1{%
-- \begingroup
-- \newlinechar`\^^M
-- \let\xeatspaces\eatspaces
-- % Undo catcode changes of \startcontents and \doprintindex
-- % When called from @insertcopying or (short)caption, we need active
-- % backslash to get it printed correctly. Previously, we had
-- % \catcode`\\=\other instead. We'll see whether a problem appears
-- % with macro expansion. --kasal, 19aug04
-- \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
-- % ... and \example
-- \spaceisspace
-- %
-- % Append \endinput to make sure that TeX does not see the ending newline.
-- % I've verified that it is necessary both for e-TeX and for ordinary TeX
-- % --kasal, 29nov03
-- \scantokens{#1\endinput}%
-- \endgroup
--}
--
--\def\scanexp#1{%
-- \edef\temp{\noexpand\scanmacro{#1}}%
-- \temp
--}
--
--\newcount\paramno % Count of parameters
--\newtoks\macname % Macro name
--\newif\ifrecursive % Is it recursive?
--
--% List of all defined macros in the form
--% \definedummyword\macro1\definedummyword\macro2...
--% Currently is also contains all @aliases; the list can be split
--% if there is a need.
--\def\macrolist{}
--
--% Add the macro to \macrolist
--\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
--\def\addtomacrolistxxx#1{%
-- \toks0 = \expandafter{\macrolist\definedummyword#1}%
-- \xdef\macrolist{\the\toks0}%
--}
--
--% Utility routines.
--% This does \let #1 = #2, with \csnames; that is,
--% \let \csname#1\endcsname = \csname#2\endcsname
--% (except of course we have to play expansion games).
--%
--\def\cslet#1#2{%
-- \expandafter\let
-- \csname#1\expandafter\endcsname
-- \csname#2\endcsname
--}
--
--% Trim leading and trailing spaces off a string.
--% Concepts from aro-bend problem 15 (see CTAN).
--{\catcode`\@=11
--\gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }}
--\gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@}
--\gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @}
--\def\unbrace#1{#1}
--\unbrace{\gdef\trim@@@ #1 } #2@{#1}
--}
--
--% Trim a single trailing ^^M off a string.
--{\catcode`\^^M=\other \catcode`\Q=3%
--\gdef\eatcr #1{\eatcra #1Q^^MQ}%
--\gdef\eatcra#1^^MQ{\eatcrb#1Q}%
--\gdef\eatcrb#1Q#2Q{#1}%
--}
--
--% Macro bodies are absorbed as an argument in a context where
--% all characters are catcode 10, 11 or 12, except \ which is active
--% (as in normal texinfo). It is necessary to change the definition of \.
--
--% It's necessary to have hard CRs when the macro is executed. This is
--% done by making ^^M (\endlinechar) catcode 12 when reading the macro
--% body, and then making it the \newlinechar in \scanmacro.
--
--\def\scanctxt{%
-- \catcode`\"=\other
-- \catcode`\+=\other
-- \catcode`\<=\other
-- \catcode`\>=\other
-- \catcode`\@=\other
-- \catcode`\^=\other
-- \catcode`\_=\other
-- \catcode`\|=\other
-- \catcode`\~=\other
--}
--
--\def\scanargctxt{%
-- \scanctxt
-- \catcode`\\=\other
-- \catcode`\^^M=\other
--}
--
--\def\macrobodyctxt{%
-- \scanctxt
-- \catcode`\{=\other
-- \catcode`\}=\other
-- \catcode`\^^M=\other
-- \usembodybackslash
--}
--
--\def\macroargctxt{%
-- \scanctxt
-- \catcode`\\=\other
--}
--
--% \mbodybackslash is the definition of \ in @macro bodies.
--% It maps \foo\ => \csname macarg.foo\endcsname => #N
--% where N is the macro parameter number.
--% We define \csname macarg.\endcsname to be \realbackslash, so
--% \\ in macro replacement text gets you a backslash.
--
--{\catcode`@=0 @catcode`@\=@active
-- @gdef at usembodybackslash{@let\=@mbodybackslash}
-- @gdef at mbodybackslash#1\{@csname macarg.#1 at endcsname}
--}
--\expandafter\def\csname macarg.\endcsname{\realbackslash}
--
--\def\macro{\recursivefalse\parsearg\macroxxx}
--\def\rmacro{\recursivetrue\parsearg\macroxxx}
--
--\def\macroxxx#1{%
-- \getargs{#1}% now \macname is the macname and \argl the arglist
-- \ifx\argl\empty % no arguments
-- \paramno=0%
-- \else
-- \expandafter\parsemargdef \argl;%
-- \fi
-- \if1\csname ismacro.\the\macname\endcsname
-- \message{Warning: redefining \the\macname}%
-- \else
-- \expandafter\ifx\csname \the\macname\endcsname \relax
-- \else \errmessage{Macro name \the\macname\space already defined}\fi
-- \global\cslet{macsave.\the\macname}{\the\macname}%
-- \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
-- \addtomacrolist{\the\macname}%
-- \fi
-- \begingroup \macrobodyctxt
-- \ifrecursive \expandafter\parsermacbody
-- \else \expandafter\parsemacbody
-- \fi}
--
--\parseargdef\unmacro{%
-- \if1\csname ismacro.#1\endcsname
-- \global\cslet{#1}{macsave.#1}%
-- \global\expandafter\let \csname ismacro.#1\endcsname=0%
-- % Remove the macro name from \macrolist:
-- \begingroup
-- \expandafter\let\csname#1\endcsname \relax
-- \let\definedummyword\unmacrodo
-- \xdef\macrolist{\macrolist}%
-- \endgroup
-- \else
-- \errmessage{Macro #1 not defined}%
-- \fi
--}
--
--% Called by \do from \dounmacro on each macro. The idea is to omit any
--% macro definitions that have been changed to \relax.
--%
--\def\unmacrodo#1{%
-- \ifx #1\relax
-- % remove this
-- \else
-- \noexpand\definedummyword \noexpand#1%
-- \fi
--}
--
--% This makes use of the obscure feature that if the last token of a
--% <parameter list> is #, then the preceding argument is delimited by
--% an opening brace, and that opening brace is not consumed.
--\def\getargs#1{\getargsxxx#1{}}
--\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
--\def\getmacname #1 #2\relax{\macname={#1}}
--\def\getmacargs#1{\def\argl{#1}}
--
--% Parse the optional {params} list. Set up \paramno and \paramlist
--% so \defmacro knows what to do. Define \macarg.blah for each blah
--% in the params list, to be ##N where N is the position in that list.
--% That gets used by \mbodybackslash (above).
--
--% We need to get `macro parameter char #' into several definitions.
--% The technique used is stolen from LaTeX: let \hash be something
--% unexpandable, insert that wherever you need a #, and then redefine
--% it to # just before using the token list produced.
--%
--% The same technique is used to protect \eatspaces till just before
--% the macro is used.
--
--\def\parsemargdef#1;{\paramno=0\def\paramlist{}%
-- \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
--\def\parsemargdefxxx#1,{%
-- \if#1;\let\next=\relax
-- \else \let\next=\parsemargdefxxx
-- \advance\paramno by 1%
-- \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
-- {\xeatspaces{\hash\the\paramno}}%
-- \edef\paramlist{\paramlist\hash\the\paramno,}%
-- \fi\next}
--
--% These two commands read recursive and nonrecursive macro bodies.
--% (They're different since rec and nonrec macros end differently.)
--
--\long\def\parsemacbody#1 at end macro%
--{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
--\long\def\parsermacbody#1 at end rmacro%
--{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
--
--% This defines the macro itself. There are six cases: recursive and
--% nonrecursive macros of zero, one, and many arguments.
--% Much magic with \expandafter here.
--% \xdef is used so that macro definitions will survive the file
--% they're defined in; @include reads the file inside a group.
--\def\defmacro{%
-- \let\hash=##% convert placeholders to macro parameter chars
-- \ifrecursive
-- \ifcase\paramno
-- % 0
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \noexpand\scanmacro{\temp}}%
-- \or % 1
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \bgroup\noexpand\macroargctxt
-- \noexpand\braceorline
-- \expandafter\noexpand\csname\the\macname xxx\endcsname}%
-- \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
-- \egroup\noexpand\scanmacro{\temp}}%
-- \else % many
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \bgroup\noexpand\macroargctxt
-- \noexpand\csname\the\macname xx\endcsname}%
-- \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-- \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-- \expandafter\expandafter
-- \expandafter\xdef
-- \expandafter\expandafter
-- \csname\the\macname xxx\endcsname
-- \paramlist{\egroup\noexpand\scanmacro{\temp}}%
-- \fi
-- \else
-- \ifcase\paramno
-- % 0
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \noexpand\norecurse{\the\macname}%
-- \noexpand\scanmacro{\temp}\egroup}%
-- \or % 1
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \bgroup\noexpand\macroargctxt
-- \noexpand\braceorline
-- \expandafter\noexpand\csname\the\macname xxx\endcsname}%
-- \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
-- \egroup
-- \noexpand\norecurse{\the\macname}%
-- \noexpand\scanmacro{\temp}\egroup}%
-- \else % many
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \bgroup\noexpand\macroargctxt
-- \expandafter\noexpand\csname\the\macname xx\endcsname}%
-- \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-- \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-- \expandafter\expandafter
-- \expandafter\xdef
-- \expandafter\expandafter
-- \csname\the\macname xxx\endcsname
-- \paramlist{%
-- \egroup
-- \noexpand\norecurse{\the\macname}%
-- \noexpand\scanmacro{\temp}\egroup}%
-- \fi
-- \fi}
--
--\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
--
--% \braceorline decides whether the next nonwhitespace character is a
--% {. If so it reads up to the closing }, if not, it reads the whole
--% line. Whatever was read is then fed to the next control sequence
--% as an argument (by \parsebrace or \parsearg)
--\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
--\def\braceorlinexxx{%
-- \ifx\nchar\bgroup\else
-- \expandafter\parsearg
-- \fi \macnamexxx}
--
--
--% @alias.
--% We need some trickery to remove the optional spaces around the equal
--% sign. Just make them active and then expand them all to nothing.
--\def\alias{\parseargusing\obeyspaces\aliasxxx}
--\def\aliasxxx #1{\aliasyyy#1\relax}
--\def\aliasyyy #1=#2\relax{%
-- {%
-- \expandafter\let\obeyedspace=\empty
-- \addtomacrolist{#1}%
-- \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
-- }%
-- \next
--}
--
--
--\message{cross references,}
--
--\newwrite\auxfile
--\newif\ifhavexrefs % True if xref values are known.
--\newif\ifwarnedxrefs % True if we warned once that they aren't known.
--
--% @inforef is relatively simple.
--\def\inforef #1{\inforefzzz #1,,,,**}
--\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
-- node \samp{\ignorespaces#1{}}}
--
--% @node's only job in TeX is to define \lastnode, which is used in
--% cross-references. The @node line might or might not have commas, and
--% might or might not have spaces before the first comma, like:
--% @node foo , bar , ...
--% We don't want such trailing spaces in the node name.
--%
--\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse}
--%
--% also remove a trailing comma, in case of something like this:
--% @node Help-Cross, , , Cross-refs
--\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
--\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
--
--\let\nwnode=\node
--\let\lastnode=\empty
--
--% Write a cross-reference definition for the current node. #1 is the
--% type (Ynumbered, Yappendix, Ynothing).
--%
--\def\donoderef#1{%
-- \ifx\lastnode\empty\else
-- \setref{\lastnode}{#1}%
-- \global\let\lastnode=\empty
-- \fi
--}
--
--% @anchor{NAME} -- define xref target at arbitrary point.
--%
--\newcount\savesfregister
--%
--\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
--\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
--\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
--
--% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
--% anchor), which consists of three parts:
--% 1) NAME-title - the current sectioning name taken from \thissection,
--% or the anchor name.
--% 2) NAME-snt - section number and type, passed as the SNT arg, or
--% empty for anchors.
--% 3) NAME-pg - the page number.
--%
--% This is called from \donoderef, \anchor, and \dofloat. In the case of
--% floats, there is an additional part, which is not written here:
--% 4) NAME-lof - the text as it should appear in a @listoffloats.
--%
--\def\setref#1#2{%
-- \pdfmkdest{#1}%
-- \iflinks
-- {%
-- \atdummies % preserve commands, but don't expand them
-- \edef\writexrdef##1##2{%
-- \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
-- ##1}{##2}}% these are parameters of \writexrdef
-- }%
-- \toks0 = \expandafter{\thissection}%
-- \immediate \writexrdef{title}{\the\toks0 }%
-- \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
-- \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
-- }%
-- \fi
--}
--
--% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is
--% the node name, #2 the name of the Info cross-reference, #3 the printed
--% node name, #4 the name of the Info file, #5 the name of the printed
--% manual. All but the node name can be omitted.
--%
--\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
--\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
--\def\ref#1{\xrefX[#1,,,,,,,]}
--\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
-- \unsepspaces
-- \def\printedmanual{\ignorespaces #5}%
-- \def\printedrefname{\ignorespaces #3}%
-- \setbox1=\hbox{\printedmanual\unskip}%
-- \setbox0=\hbox{\printedrefname\unskip}%
-- \ifdim \wd0 = 0pt
-- % No printed node name was explicitly given.
-- \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
-- % Use the node name inside the square brackets.
-- \def\printedrefname{\ignorespaces #1}%
-- \else
-- % Use the actual chapter/section title appear inside
-- % the square brackets. Use the real section title if we have it.
-- \ifdim \wd1 > 0pt
-- % It is in another manual, so we don't have it.
-- \def\printedrefname{\ignorespaces #1}%
-- \else
-- \ifhavexrefs
-- % We know the real title if we have the xref values.
-- \def\printedrefname{\refx{#1-title}{}}%
-- \else
-- % Otherwise just copy the Info node name.
-- \def\printedrefname{\ignorespaces #1}%
-- \fi%
-- \fi
-- \fi
-- \fi
-- %
-- % Make link in pdf output.
-- \ifpdf
-- \leavevmode
-- \getfilename{#4}%
-- {\indexnofonts
-- \turnoffactive
-- % See comments at \activebackslashdouble.
-- {\activebackslashdouble \xdef\pdfxrefdest{#1}%
-- \backslashparens\pdfxrefdest}%
-- %
-- \ifnum\filenamelength>0
-- \startlink attr{/Border [0 0 0]}%
-- goto file{\the\filename.pdf} name{\pdfxrefdest}%
-- \else
-- \startlink attr{/Border [0 0 0]}%
-- goto name{\pdfmkpgn{\pdfxrefdest}}%
-- \fi
-- }%
-- \linkcolor
-- \fi
-- %
-- % Float references are printed completely differently: "Figure 1.2"
-- % instead of "[somenode], p.3". We distinguish them by the
-- % LABEL-title being set to a magic string.
-- {%
-- % Have to otherify everything special to allow the \csname to
-- % include an _ in the xref name, etc.
-- \indexnofonts
-- \turnoffactive
-- \expandafter\global\expandafter\let\expandafter\Xthisreftitle
-- \csname XR#1-title\endcsname
-- }%
-- \iffloat\Xthisreftitle
-- % If the user specified the print name (third arg) to the ref,
-- % print it instead of our usual "Figure 1.2".
-- \ifdim\wd0 = 0pt
-- \refx{#1-snt}{}%
-- \else
-- \printedrefname
-- \fi
-- %
-- % if the user also gave the printed manual name (fifth arg), append
-- % "in MANUALNAME".
-- \ifdim \wd1 > 0pt
-- \space \putwordin{} \cite{\printedmanual}%
-- \fi
-- \else
-- % node/anchor (non-float) references.
-- %
-- % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
-- % insert empty discretionaries after hyphens, which means that it will
-- % not find a line break at a hyphen in a node names. Since some manuals
-- % are best written with fairly long node names, containing hyphens, this
-- % is a loss. Therefore, we give the text of the node name again, so it
-- % is as if TeX is seeing it for the first time.
-- \ifdim \wd1 > 0pt
-- \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
-- \else
-- % _ (for example) has to be the character _ for the purposes of the
-- % control sequence corresponding to the node, but it has to expand
-- % into the usual \leavevmode...\vrule stuff for purposes of
-- % printing. So we \turnoffactive for the \refx-snt, back on for the
-- % printing, back off for the \refx-pg.
-- {\turnoffactive
-- % Only output a following space if the -snt ref is nonempty; for
-- % @unnumbered and @anchor, it won't be.
-- \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
-- \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
-- }%
-- % output the `[mynode]' via a macro so it can be overridden.
-- \xrefprintnodename\printedrefname
-- %
-- % But we always want a comma and a space:
-- ,\space
-- %
-- % output the `page 3'.
-- \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-- \fi
-- \fi
-- \endlink
--\endgroup}
--
--% This macro is called from \xrefX for the `[nodename]' part of xref
--% output. It's a separate macro only so it can be changed more easily,
--% since square brackets don't work well in some documents. Particularly
--% one that Bob is working on :).
--%
--\def\xrefprintnodename#1{[#1]}
--
--% Things referred to by \setref.
--%
--\def\Ynothing{}
--\def\Yomitfromtoc{}
--\def\Ynumbered{%
-- \ifnum\secno=0
-- \putwordChapter at tie \the\chapno
-- \else \ifnum\subsecno=0
-- \putwordSection at tie \the\chapno.\the\secno
-- \else \ifnum\subsubsecno=0
-- \putwordSection at tie \the\chapno.\the\secno.\the\subsecno
-- \else
-- \putwordSection at tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno
-- \fi\fi\fi
--}
--\def\Yappendix{%
-- \ifnum\secno=0
-- \putwordAppendix at tie @char\the\appendixno{}%
-- \else \ifnum\subsecno=0
-- \putwordSection at tie @char\the\appendixno.\the\secno
-- \else \ifnum\subsubsecno=0
-- \putwordSection at tie @char\the\appendixno.\the\secno.\the\subsecno
-- \else
-- \putwordSection at tie
-- @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno
-- \fi\fi\fi
--}
--
--% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
--% If its value is nonempty, SUFFIX is output afterward.
--%
--\def\refx#1#2{%
-- {%
-- \indexnofonts
-- \otherbackslash
-- \expandafter\global\expandafter\let\expandafter\thisrefX
-- \csname XR#1\endcsname
-- }%
-- \ifx\thisrefX\relax
-- % If not defined, say something at least.
-- \angleleft un\-de\-fined\angleright
-- \iflinks
-- \ifhavexrefs
-- \message{\linenumber Undefined cross reference `#1'.}%
-- \else
-- \ifwarnedxrefs\else
-- \global\warnedxrefstrue
-- \message{Cross reference values unknown; you must run TeX again.}%
-- \fi
-- \fi
-- \fi
-- \else
-- % It's defined, so just use it.
-- \thisrefX
-- \fi
-- #2% Output the suffix in any case.
--}
--
--% This is the macro invoked by entries in the aux file. Usually it's
--% just a \def (we prepend XR to the control sequence name to avoid
--% collisions). But if this is a float type, we have more work to do.
--%
--\def\xrdef#1#2{%
-- {% The node name might contain 8-bit characters, which in our current
-- % implementation are changed to commands like @'e. Don't let these
-- % mess up the control sequence name.
-- \indexnofonts
-- \turnoffactive
-- \xdef\safexrefname{#1}%
-- }%
-- %
-- \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
-- %
-- % Was that xref control sequence that we just defined for a float?
-- \expandafter\iffloat\csname XR\safexrefname\endcsname
-- % it was a float, and we have the (safe) float type in \iffloattype.
-- \expandafter\let\expandafter\floatlist
-- \csname floatlist\iffloattype\endcsname
-- %
-- % Is this the first time we've seen this float type?
-- \expandafter\ifx\floatlist\relax
-- \toks0 = {\do}% yes, so just \do
-- \else
-- % had it before, so preserve previous elements in list.
-- \toks0 = \expandafter{\floatlist\do}%
-- \fi
-- %
-- % Remember this xref in the control sequence \floatlistFLOATTYPE,
-- % for later use in \listoffloats.
-- \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0
-- {\safexrefname}}%
-- \fi
--}
--
--% Read the last existing aux file, if any. No error if none exists.
--%
--\def\tryauxfile{%
-- \openin 1 \jobname.aux
-- \ifeof 1 \else
-- \readdatafile{aux}%
-- \global\havexrefstrue
-- \fi
-- \closein 1
--}
--
--\def\setupdatafile{%
-- \catcode`\^^@=\other
-- \catcode`\^^A=\other
-- \catcode`\^^B=\other
-- \catcode`\^^C=\other
-- \catcode`\^^D=\other
-- \catcode`\^^E=\other
-- \catcode`\^^F=\other
-- \catcode`\^^G=\other
-- \catcode`\^^H=\other
-- \catcode`\^^K=\other
-- \catcode`\^^L=\other
-- \catcode`\^^N=\other
-- \catcode`\^^P=\other
-- \catcode`\^^Q=\other
-- \catcode`\^^R=\other
-- \catcode`\^^S=\other
-- \catcode`\^^T=\other
-- \catcode`\^^U=\other
-- \catcode`\^^V=\other
-- \catcode`\^^W=\other
-- \catcode`\^^X=\other
-- \catcode`\^^Z=\other
-- \catcode`\^^[=\other
-- \catcode`\^^\=\other
-- \catcode`\^^]=\other
-- \catcode`\^^^=\other
-- \catcode`\^^_=\other
-- % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
-- % in xref tags, i.e., node names. But since ^^e4 notation isn't
-- % supported in the main text, it doesn't seem desirable. Furthermore,
-- % that is not enough: for node names that actually contain a ^
-- % character, we would end up writing a line like this: 'xrdef {'hat
-- % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
-- % argument, and \hat is not an expandable control sequence. It could
-- % all be worked out, but why? Either we support ^^ or we don't.
-- %
-- % The other change necessary for this was to define \auxhat:
-- % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
-- % and then to call \auxhat in \setq.
-- %
-- \catcode`\^=\other
-- %
-- % Special characters. Should be turned off anyway, but...
-- \catcode`\~=\other
-- \catcode`\[=\other
-- \catcode`\]=\other
-- \catcode`\"=\other
-- \catcode`\_=\other
-- \catcode`\|=\other
-- \catcode`\<=\other
-- \catcode`\>=\other
-- \catcode`\$=\other
-- \catcode`\#=\other
-- \catcode`\&=\other
-- \catcode`\%=\other
-- \catcode`+=\other % avoid \+ for paranoia even though we've turned it off
-- %
-- % This is to support \ in node names and titles, since the \
-- % characters end up in a \csname. It's easier than
-- % leaving it active and making its active definition an actual \
-- % character. What I don't understand is why it works in the *value*
-- % of the xrdef. Seems like it should be a catcode12 \, and that
-- % should not typeset properly. But it works, so I'm moving on for
-- % now. --karl, 15jan04.
-- \catcode`\\=\other
-- %
-- % Make the characters 128-255 be printing characters.
-- {%
-- \count1=128
-- \def\loop{%
-- \catcode\count1=\other
-- \advance\count1 by 1
-- \ifnum \count1<256 \loop \fi
-- }%
-- }%
-- %
-- % @ is our escape character in .aux files, and we need braces.
-- \catcode`\{=1
-- \catcode`\}=2
-- \catcode`\@=0
--}
--
--\def\readdatafile#1{%
--\begingroup
-- \setupdatafile
-- \input\jobname.#1
--\endgroup}
--
--
--\message{insertions,}
--% including footnotes.
--
--\newcount \footnoteno
--
--% The trailing space in the following definition for supereject is
--% vital for proper filling; pages come out unaligned when you do a
--% pagealignmacro call if that space before the closing brace is
--% removed. (Generally, numeric constants should always be followed by a
--% space to prevent strange expansion errors.)
--\def\supereject{\par\penalty -20000\footnoteno =0 }
--
--% @footnotestyle is meaningful for info output only.
--\let\footnotestyle=\comment
--
--{\catcode `\@=11
--%
--% Auto-number footnotes. Otherwise like plain.
--\gdef\footnote{%
-- \let\indent=\ptexindent
-- \let\noindent=\ptexnoindent
-- \global\advance\footnoteno by \@ne
-- \edef\thisfootno{$^{\the\footnoteno}$}%
-- %
-- % In case the footnote comes at the end of a sentence, preserve the
-- % extra spacing after we do the footnote number.
-- \let\@sf\empty
-- \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi
-- %
-- % Remove inadvertent blank space before typesetting the footnote number.
-- \unskip
-- \thisfootno\@sf
-- \dofootnote
--}%
--
--% Don't bother with the trickery in plain.tex to not require the
--% footnote text as a parameter. Our footnotes don't need to be so general.
--%
--% Oh yes, they do; otherwise, @ifset (and anything else that uses
--% \parseargline) fails inside footnotes because the tokens are fixed when
--% the footnote is read. --karl, 16nov96.
--%
--\gdef\dofootnote{%
-- \insert\footins\bgroup
-- % We want to typeset this text as a normal paragraph, even if the
-- % footnote reference occurs in (for example) a display environment.
-- % So reset some parameters.
-- \hsize=\pagewidth
-- \interlinepenalty\interfootnotelinepenalty
-- \splittopskip\ht\strutbox % top baseline for broken footnotes
-- \splitmaxdepth\dp\strutbox
-- \floatingpenalty\@MM
-- \leftskip\z at skip
-- \rightskip\z at skip
-- \spaceskip\z at skip
-- \xspaceskip\z at skip
-- \parindent\defaultparindent
-- %
-- \smallfonts \rm
-- %
-- % Because we use hanging indentation in footnotes, a @noindent appears
-- % to exdent this text, so make it be a no-op. makeinfo does not use
-- % hanging indentation so @noindent can still be needed within footnote
-- % text after an @example or the like (not that this is good style).
-- \let\noindent = \relax
-- %
-- % Hang the footnote text off the number. Use \everypar in case the
-- % footnote extends for more than one paragraph.
-- \everypar = {\hang}%
-- \textindent{\thisfootno}%
-- %
-- % Don't crash into the line above the footnote text. Since this
-- % expands into a box, it must come within the paragraph, lest it
-- % provide a place where TeX can split the footnote.
-- \footstrut
-- \futurelet\next\fo at t
--}
--}%end \catcode `\@=11
--
--% In case a @footnote appears in a vbox, save the footnote text and create
--% the real \insert just after the vbox finished. Otherwise, the insertion
--% would be lost.
--% Similarily, if a @footnote appears inside an alignment, save the footnote
--% text to a box and make the \insert when a row of the table is finished.
--% And the same can be done for other insert classes. --kasal, 16nov03.
--
--% Replace the \insert primitive by a cheating macro.
--% Deeper inside, just make sure that the saved insertions are not spilled
--% out prematurely.
--%
--\def\startsavinginserts{%
-- \ifx \insert\ptexinsert
-- \let\insert\saveinsert
-- \else
-- \let\checkinserts\relax
-- \fi
--}
--
--% This \insert replacement works for both \insert\footins{foo} and
--% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}.
--%
--\def\saveinsert#1{%
-- \edef\next{\noexpand\savetobox \makeSAVEname#1}%
-- \afterassignment\next
-- % swallow the left brace
-- \let\temp =
--}
--\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}}
--\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1}
--
--\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi}
--
--\def\placesaveins#1{%
-- \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname
-- {\box#1}%
--}
--
--% eat @SAVE -- beware, all of them have catcode \other:
--{
-- \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials % ;-)
-- \gdef\gobblesave @SAVE{}
--}
--
--% initialization:
--\def\newsaveins #1{%
-- \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}%
-- \next
--}
--\def\newsaveinsX #1{%
-- \csname newbox\endcsname #1%
-- \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts
-- \checksaveins #1}%
--}
--
--% initialize:
--\let\checkinserts\empty
--\newsaveins\footins
--\newsaveins\margin
--
--
--% @image. We use the macros from epsf.tex to support this.
--% If epsf.tex is not installed and @image is used, we complain.
--%
--% Check for and read epsf.tex up front. If we read it only at @image
--% time, we might be inside a group, and then its definitions would get
--% undone and the next image would fail.
--\openin 1 = epsf.tex
--\ifeof 1 \else
-- % Do not bother showing banner with epsf.tex v2.7k (available in
-- % doc/epsf.tex and on ctan).
-- \def\epsfannounce{\toks0 = }%
-- \input epsf.tex
--\fi
--\closein 1
--%
--% We will only complain once about lack of epsf.tex.
--\newif\ifwarnednoepsf
--\newhelp\noepsfhelp{epsf.tex must be installed for images to
-- work. It is also included in the Texinfo distribution, or you can get
-- it from ftp://tug.org/tex/epsf.tex.}
--%
--\def\image#1{%
-- \ifx\epsfbox\undefined
-- \ifwarnednoepsf \else
-- \errhelp = \noepsfhelp
-- \errmessage{epsf.tex not found, images will be ignored}%
-- \global\warnednoepsftrue
-- \fi
-- \else
-- \imagexxx #1,,,,,\finish
-- \fi
--}
--%
--% Arguments to @image:
--% #1 is (mandatory) image filename; we tack on .eps extension.
--% #2 is (optional) width, #3 is (optional) height.
--% #4 is (ignored optional) html alt text.
--% #5 is (ignored optional) extension.
--% #6 is just the usual extra ignored arg for parsing this stuff.
--\newif\ifimagevmode
--\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
-- \catcode`\^^M = 5 % in case we're inside an example
-- \normalturnoffactive % allow _ et al. in names
-- % If the image is by itself, center it.
-- \ifvmode
-- \imagevmodetrue
-- \nobreak\bigskip
-- % Usually we'll have text after the image which will insert
-- % \parskip glue, so insert it here too to equalize the space
-- % above and below.
-- \nobreak\vskip\parskip
-- \nobreak
-- \line\bgroup
-- \fi
-- %
-- % Output the image.
-- \ifpdf
-- \dopdfimage{#1}{#2}{#3}%
-- \else
-- % \epsfbox itself resets \epsf?size at each figure.
-- \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
-- \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
-- \epsfbox{#1.eps}%
-- \fi
-- %
-- \ifimagevmode \egroup \bigbreak \fi % space after the image
--\endgroup}
--
--
--% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables,
--% etc. We don't actually implement floating yet, we always include the
--% float "here". But it seemed the best name for the future.
--%
--\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish}
--
--% There may be a space before second and/or third parameter; delete it.
--\def\eatcommaspace#1, {#1,}
--
--% #1 is the optional FLOATTYPE, the text label for this float, typically
--% "Figure", "Table", "Example", etc. Can't contain commas. If omitted,
--% this float will not be numbered and cannot be referred to.
--%
--% #2 is the optional xref label. Also must be present for the float to
--% be referable.
--%
--% #3 is the optional positioning argument; for now, it is ignored. It
--% will somehow specify the positions allowed to float to (here, top, bottom).
--%
--% We keep a separate counter for each FLOATTYPE, which we reset at each
--% chapter-level command.
--\let\resetallfloatnos=\empty
--%
--\def\dofloat#1,#2,#3,#4\finish{%
-- \let\thiscaption=\empty
-- \let\thisshortcaption=\empty
-- %
-- % don't lose footnotes inside @float.
-- %
-- % BEWARE: when the floats start float, we have to issue warning whenever an
-- % insert appears inside a float which could possibly float. --kasal, 26may04
-- %
-- \startsavinginserts
-- %
-- % We can't be used inside a paragraph.
-- \par
-- %
-- \vtop\bgroup
-- \def\floattype{#1}%
-- \def\floatlabel{#2}%
-- \def\floatloc{#3}% we do nothing with this yet.
-- %
-- \ifx\floattype\empty
-- \let\safefloattype=\empty
-- \else
-- {%
-- % the floattype might have accents or other special characters,
-- % but we need to use it in a control sequence name.
-- \indexnofonts
-- \turnoffactive
-- \xdef\safefloattype{\floattype}%
-- }%
-- \fi
-- %
-- % If label is given but no type, we handle that as the empty type.
-- \ifx\floatlabel\empty \else
-- % We want each FLOATTYPE to be numbered separately (Figure 1,
-- % Table 1, Figure 2, ...). (And if no label, no number.)
-- %
-- \expandafter\getfloatno\csname\safefloattype floatno\endcsname
-- \global\advance\floatno by 1
-- %
-- {%
-- % This magic value for \thissection is output by \setref as the
-- % XREFLABEL-title value. \xrefX uses it to distinguish float
-- % labels (which have a completely different output format) from
-- % node and anchor labels. And \xrdef uses it to construct the
-- % lists of floats.
-- %
-- \edef\thissection{\floatmagic=\safefloattype}%
-- \setref{\floatlabel}{Yfloat}%
-- }%
-- \fi
-- %
-- % start with \parskip glue, I guess.
-- \vskip\parskip
-- %
-- % Don't suppress indentation if a float happens to start a section.
-- \restorefirstparagraphindent
--}
--
--% we have these possibilities:
--% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
--% @float Foo,lbl & no caption: Foo 1.1
--% @float Foo & @caption{Cap}: Foo: Cap
--% @float Foo & no caption: Foo
--% @float ,lbl & Caption{Cap}: 1.1: Cap
--% @float ,lbl & no caption: 1.1
--% @float & @caption{Cap}: Cap
--% @float & no caption:
--%
--\def\Efloat{%
-- \let\floatident = \empty
-- %
-- % In all cases, if we have a float type, it comes first.
-- \ifx\floattype\empty \else \def\floatident{\floattype}\fi
-- %
-- % If we have an xref label, the number comes next.
-- \ifx\floatlabel\empty \else
-- \ifx\floattype\empty \else % if also had float type, need tie first.
-- \appendtomacro\floatident{\tie}%
-- \fi
-- % the number.
-- \appendtomacro\floatident{\chaplevelprefix\the\floatno}%
-- \fi
-- %
-- % Start the printed caption with what we've constructed in
-- % \floatident, but keep it separate; we need \floatident again.
-- \let\captionline = \floatident
-- %
-- \ifx\thiscaption\empty \else
-- \ifx\floatident\empty \else
-- \appendtomacro\captionline{: }% had ident, so need a colon between
-- \fi
-- %
-- % caption text.
-- \appendtomacro\captionline{\scanexp\thiscaption}%
-- \fi
-- %
-- % If we have anything to print, print it, with space before.
-- % Eventually this needs to become an \insert.
-- \ifx\captionline\empty \else
-- \vskip.5\parskip
-- \captionline
-- %
-- % Space below caption.
-- \vskip\parskip
-- \fi
-- %
-- % If have an xref label, write the list of floats info. Do this
-- % after the caption, to avoid chance of it being a breakpoint.
-- \ifx\floatlabel\empty \else
-- % Write the text that goes in the lof to the aux file as
-- % \floatlabel-lof. Besides \floatident, we include the short
-- % caption if specified, else the full caption if specified, else nothing.
-- {%
-- \atdummies
-- %
-- % since we read the caption text in the macro world, where ^^M
-- % is turned into a normal character, we have to scan it back, so
-- % we don't write the literal three characters "^^M" into the aux file.
-- \scanexp{%
-- \xdef\noexpand\gtemp{%
-- \ifx\thisshortcaption\empty
-- \thiscaption
-- \else
-- \thisshortcaption
-- \fi
-- }%
-- }%
-- \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
-- \ifx\gtemp\empty \else : \gtemp \fi}}%
-- }%
-- \fi
-- \egroup % end of \vtop
-- %
-- % place the captured inserts
-- %
-- % BEWARE: when the floats start floating, we have to issue warning
-- % whenever an insert appears inside a float which could possibly
-- % float. --kasal, 26may04
-- %
-- \checkinserts
--}
--
--% Append the tokens #2 to the definition of macro #1, not expanding either.
--%
--\def\appendtomacro#1#2{%
-- \expandafter\def\expandafter#1\expandafter{#1#2}%
--}
--
--% @caption, @shortcaption
--%
--\def\caption{\docaption\thiscaption}
--\def\shortcaption{\docaption\thisshortcaption}
--\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption}
--\def\defcaption#1#2{\egroup \def#1{#2}}
--
--% The parameter is the control sequence identifying the counter we are
--% going to use. Create it if it doesn't exist and assign it to \floatno.
--\def\getfloatno#1{%
-- \ifx#1\relax
-- % Haven't seen this figure type before.
-- \csname newcount\endcsname #1%
-- %
-- % Remember to reset this floatno at the next chap.
-- \expandafter\gdef\expandafter\resetallfloatnos
-- \expandafter{\resetallfloatnos #1=0 }%
-- \fi
-- \let\floatno#1%
--}
--
--% \setref calls this to get the XREFLABEL-snt value. We want an @xref
--% to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we
--% first read the @float command.
--%
--\def\Yfloat{\floattype at tie \chaplevelprefix\the\floatno}%
--
--% Magic string used for the XREFLABEL-title value, so \xrefX can
--% distinguish floats from other xref types.
--\def\floatmagic{!!float!!}
--
--% #1 is the control sequence we are passed; we expand into a conditional
--% which is true if #1 represents a float ref. That is, the magic
--% \thissection value which we \setref above.
--%
--\def\iffloat#1{\expandafter\doiffloat#1==\finish}
--%
--% #1 is (maybe) the \floatmagic string. If so, #2 will be the
--% (safe) float type for this float. We set \iffloattype to #2.
--%
--\def\doiffloat#1=#2=#3\finish{%
-- \def\temp{#1}%
-- \def\iffloattype{#2}%
-- \ifx\temp\floatmagic
--}
--
--% @listoffloats FLOATTYPE - print a list of floats like a table of contents.
--%
--\parseargdef\listoffloats{%
-- \def\floattype{#1}% floattype
-- {%
-- % the floattype might have accents or other special characters,
-- % but we need to use it in a control sequence name.
-- \indexnofonts
-- \turnoffactive
-- \xdef\safefloattype{\floattype}%
-- }%
-- %
-- % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE.
-- \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax
-- \ifhavexrefs
-- % if the user said @listoffloats foo but never @float foo.
-- \message{\linenumber No `\safefloattype' floats to list.}%
-- \fi
-- \else
-- \begingroup
-- \leftskip=\tocindent % indent these entries like a toc
-- \let\do=\listoffloatsdo
-- \csname floatlist\safefloattype\endcsname
-- \endgroup
-- \fi
--}
--
--% This is called on each entry in a list of floats. We're passed the
--% xref label, in the form LABEL-title, which is how we save it in the
--% aux file. We strip off the -title and look up \XRLABEL-lof, which
--% has the text we're supposed to typeset here.
--%
--% Figures without xref labels will not be included in the list (since
--% they won't appear in the aux file).
--%
--\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
--\def\listoffloatsdoentry#1-title\finish{{%
-- % Can't fully expand XR#1-lof because it can contain anything. Just
-- % pass the control sequence. On the other hand, XR#1-pg is just the
-- % page number, and we want to fully expand that so we can get a link
-- % in pdf output.
-- \toksA = \expandafter{\csname XR#1-lof\endcsname}%
-- %
-- % use the same \entry macro we use to generate the TOC and index.
-- \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}%
-- \writeentry
--}}
--
--
--\message{localization,}
--
--% @documentlanguage is usually given very early, just after
--% @setfilename. If done too late, it may not override everything
--% properly. Single argument is the language abbreviation.
--% It would be nice if we could set up a hyphenation file here.
--%
--\parseargdef\documentlanguage{%
-- \tex % read txi-??.tex file in plain TeX.
-- % Read the file if it exists.
-- \openin 1 txi-#1.tex
-- \ifeof 1
-- \errhelp = \nolanghelp
-- \errmessage{Cannot read language file txi-#1.tex}%
-- \else
-- \input txi-#1.tex
-- \fi
-- \closein 1
-- \endgroup
--}
--\newhelp\nolanghelp{The given language definition file cannot be found or
--is empty. Maybe you need to install it? In the current directory
--should work if nowhere else does.}
--
--% Set the catcode of characters 128 through 255 to the specified number.
--%
--\def\setnonasciicharscatcode#1{%
-- \count255=128
-- \loop\ifnum\count255<256
-- \global\catcode\count255=#1
-- \advance\count255 by 1
-- \repeat
--}
--
--% @documentencoding sets the definition of non-ASCII characters
--% according to the specified encoding.
--%
--\parseargdef\documentencoding{%
-- % Encoding being declared for the document.
-- \def\declaredencoding{\csname #1.enc\endcsname}%
-- %
-- % Supported encodings: names converted to tokens in order to be able
-- % to compare them with \ifx.
-- \def\ascii{\csname US-ASCII.enc\endcsname}%
-- \def\latnine{\csname ISO-8859-15.enc\endcsname}%
-- \def\latone{\csname ISO-8859-1.enc\endcsname}%
-- \def\lattwo{\csname ISO-8859-2.enc\endcsname}%
-- \def\utfeight{\csname UTF-8.enc\endcsname}%
-- %
-- \ifx \declaredencoding \ascii
-- \asciichardefs
-- %
-- \else \ifx \declaredencoding \lattwo
-- \setnonasciicharscatcode\active
-- \lattwochardefs
-- %
-- \else \ifx \declaredencoding \latone
-- \setnonasciicharscatcode\active
-- \latonechardefs
-- %
-- \else \ifx \declaredencoding \latnine
-- \setnonasciicharscatcode\active
-- \latninechardefs
-- %
-- \else \ifx \declaredencoding \utfeight
-- \setnonasciicharscatcode\active
-- \utfeightchardefs
-- %
-- \else
-- \message{Unknown document encoding #1, ignoring.}%
-- %
-- \fi % utfeight
-- \fi % latnine
-- \fi % latone
-- \fi % lattwo
-- \fi % ascii
--}
--
--% A message to be logged when using a character that isn't available
--% the default font encoding (OT1).
--%
--\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
--
--% Take account of \c (plain) vs. \, (Texinfo) difference.
--\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
--
--% First, make active non-ASCII characters in order for them to be
--% correctly categorized when TeX reads the replacement text of
--% macros containing the character definitions.
--\setnonasciicharscatcode\active
--%
--% Latin1 (ISO-8859-1) character definitions.
--\def\latonechardefs{%
-- \gdef^^a0{~}
-- \gdef^^a1{\exclamdown}
-- \gdef^^a2{\missingcharmsg{CENT SIGN}}
-- \gdef^^a3{{\pounds}}
-- \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
-- \gdef^^a5{\missingcharmsg{YEN SIGN}}
-- \gdef^^a6{\missingcharmsg{BROKEN BAR}}
-- \gdef^^a7{\S}
-- \gdef^^a8{\"{}}
-- \gdef^^a9{\copyright}
-- \gdef^^aa{\ordf}
-- \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}}
-- \gdef^^ac{$\lnot$}
-- \gdef^^ad{\-}
-- \gdef^^ae{\registeredsymbol}
-- \gdef^^af{\={}}
-- %
-- \gdef^^b0{\textdegree}
-- \gdef^^b1{$\pm$}
-- \gdef^^b2{$^2$}
-- \gdef^^b3{$^3$}
-- \gdef^^b4{\'{}}
-- \gdef^^b5{$\mu$}
-- \gdef^^b6{\P}
-- %
-- \gdef^^b7{$^.$}
-- \gdef^^b8{\cedilla\ }
-- \gdef^^b9{$^1$}
-- \gdef^^ba{\ordm}
-- %
-- \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}}
-- \gdef^^bc{$1\over4$}
-- \gdef^^bd{$1\over2$}
-- \gdef^^be{$3\over4$}
-- \gdef^^bf{\questiondown}
-- %
-- \gdef^^c0{\`A}
-- \gdef^^c1{\'A}
-- \gdef^^c2{\^A}
-- \gdef^^c3{\~A}
-- \gdef^^c4{\"A}
-- \gdef^^c5{\ringaccent A}
-- \gdef^^c6{\AE}
-- \gdef^^c7{\cedilla C}
-- \gdef^^c8{\`E}
-- \gdef^^c9{\'E}
-- \gdef^^ca{\^E}
-- \gdef^^cb{\"E}
-- \gdef^^cc{\`I}
-- \gdef^^cd{\'I}
-- \gdef^^ce{\^I}
-- \gdef^^cf{\"I}
-- %
-- \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}}
-- \gdef^^d1{\~N}
-- \gdef^^d2{\`O}
-- \gdef^^d3{\'O}
-- \gdef^^d4{\^O}
-- \gdef^^d5{\~O}
-- \gdef^^d6{\"O}
-- \gdef^^d7{$\times$}
-- \gdef^^d8{\O}
-- \gdef^^d9{\`U}
-- \gdef^^da{\'U}
-- \gdef^^db{\^U}
-- \gdef^^dc{\"U}
-- \gdef^^dd{\'Y}
-- \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}}
-- \gdef^^df{\ss}
-- %
-- \gdef^^e0{\`a}
-- \gdef^^e1{\'a}
-- \gdef^^e2{\^a}
-- \gdef^^e3{\~a}
-- \gdef^^e4{\"a}
-- \gdef^^e5{\ringaccent a}
-- \gdef^^e6{\ae}
-- \gdef^^e7{\cedilla c}
-- \gdef^^e8{\`e}
-- \gdef^^e9{\'e}
-- \gdef^^ea{\^e}
-- \gdef^^eb{\"e}
-- \gdef^^ec{\`{\dotless i}}
-- \gdef^^ed{\'{\dotless i}}
-- \gdef^^ee{\^{\dotless i}}
-- \gdef^^ef{\"{\dotless i}}
-- %
-- \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}}
-- \gdef^^f1{\~n}
-- \gdef^^f2{\`o}
-- \gdef^^f3{\'o}
-- \gdef^^f4{\^o}
-- \gdef^^f5{\~o}
-- \gdef^^f6{\"o}
-- \gdef^^f7{$\div$}
-- \gdef^^f8{\o}
-- \gdef^^f9{\`u}
-- \gdef^^fa{\'u}
-- \gdef^^fb{\^u}
-- \gdef^^fc{\"u}
-- \gdef^^fd{\'y}
-- \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}}
-- \gdef^^ff{\"y}
--}
--
--% Latin9 (ISO-8859-15) encoding character definitions.
--\def\latninechardefs{%
-- % Encoding is almost identical to Latin1.
-- \latonechardefs
-- %
-- \gdef^^a4{\euro}
-- \gdef^^a6{\v S}
-- \gdef^^a8{\v s}
-- \gdef^^b4{\v Z}
-- \gdef^^b8{\v z}
-- \gdef^^bc{\OE}
-- \gdef^^bd{\oe}
-- \gdef^^be{\"Y}
--}
--
--% Latin2 (ISO-8859-2) character definitions.
--\def\lattwochardefs{%
-- \gdef^^a0{~}
-- \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}}
-- \gdef^^a2{\u{}}
-- \gdef^^a3{\L}
-- \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
-- \gdef^^a5{\v L}
-- \gdef^^a6{\'S}
-- \gdef^^a7{\S}
-- \gdef^^a8{\"{}}
-- \gdef^^a9{\v S}
-- \gdef^^aa{\cedilla S}
-- \gdef^^ab{\v T}
-- \gdef^^ac{\'Z}
-- \gdef^^ad{\-}
-- \gdef^^ae{\v Z}
-- \gdef^^af{\dotaccent Z}
-- %
-- \gdef^^b0{\textdegree}
-- \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}}
-- \gdef^^b2{\missingcharmsg{OGONEK}}
-- \gdef^^b3{\l}
-- \gdef^^b4{\'{}}
-- \gdef^^b5{\v l}
-- \gdef^^b6{\'s}
-- \gdef^^b7{\v{}}
-- \gdef^^b8{\cedilla\ }
-- \gdef^^b9{\v s}
-- \gdef^^ba{\cedilla s}
-- \gdef^^bb{\v t}
-- \gdef^^bc{\'z}
-- \gdef^^bd{\H{}}
-- \gdef^^be{\v z}
-- \gdef^^bf{\dotaccent z}
-- %
-- \gdef^^c0{\'R}
-- \gdef^^c1{\'A}
-- \gdef^^c2{\^A}
-- \gdef^^c3{\u A}
-- \gdef^^c4{\"A}
-- \gdef^^c5{\'L}
-- \gdef^^c6{\'C}
-- \gdef^^c7{\cedilla C}
-- \gdef^^c8{\v C}
-- \gdef^^c9{\'E}
-- \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}}
-- \gdef^^cb{\"E}
-- \gdef^^cc{\v E}
-- \gdef^^cd{\'I}
-- \gdef^^ce{\^I}
-- \gdef^^cf{\v D}
-- %
-- \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}}
-- \gdef^^d1{\'N}
-- \gdef^^d2{\v N}
-- \gdef^^d3{\'O}
-- \gdef^^d4{\^O}
-- \gdef^^d5{\H O}
-- \gdef^^d6{\"O}
-- \gdef^^d7{$\times$}
-- \gdef^^d8{\v R}
-- \gdef^^d9{\ringaccent U}
-- \gdef^^da{\'U}
-- \gdef^^db{\H U}
-- \gdef^^dc{\"U}
-- \gdef^^dd{\'Y}
-- \gdef^^de{\cedilla T}
-- \gdef^^df{\ss}
-- %
-- \gdef^^e0{\'r}
-- \gdef^^e1{\'a}
-- \gdef^^e2{\^a}
-- \gdef^^e3{\u a}
-- \gdef^^e4{\"a}
-- \gdef^^e5{\'l}
-- \gdef^^e6{\'c}
-- \gdef^^e7{\cedilla c}
-- \gdef^^e8{\v c}
-- \gdef^^e9{\'e}
-- \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}}
-- \gdef^^eb{\"e}
-- \gdef^^ec{\v e}
-- \gdef^^ed{\'\i}
-- \gdef^^ee{\^\i}
-- \gdef^^ef{\v d}
-- %
-- \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}}
-- \gdef^^f1{\'n}
-- \gdef^^f2{\v n}
-- \gdef^^f3{\'o}
-- \gdef^^f4{\^o}
-- \gdef^^f5{\H o}
-- \gdef^^f6{\"o}
-- \gdef^^f7{$\div$}
-- \gdef^^f8{\v r}
-- \gdef^^f9{\ringaccent u}
-- \gdef^^fa{\'u}
-- \gdef^^fb{\H u}
-- \gdef^^fc{\"u}
-- \gdef^^fd{\'y}
-- \gdef^^fe{\cedilla t}
-- \gdef^^ff{\dotaccent{}}
--}
--
--% UTF-8 character definitions.
--%
--% This code to support UTF-8 is based on LaTeX's utf8.def, with some
--% changes for Texinfo conventions. It is included here under the GPL by
--% permission from Frank Mittelbach and the LaTeX team.
--%
--\newcount\countUTFx
--\newcount\countUTFy
--\newcount\countUTFz
--
--\gdef\UTFviiiTwoOctets#1#2{\expandafter
-- \UTFviiiDefined\csname u8:#1\string #2\endcsname}
--%
--\gdef\UTFviiiThreeOctets#1#2#3{\expandafter
-- \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
--%
--\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter
-- \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
--
--\gdef\UTFviiiDefined#1{%
-- \ifx #1\relax
-- \message{\linenumber Unicode char \string #1 not defined for Texinfo}%
-- \else
-- \expandafter #1%
-- \fi
--}
--
--\begingroup
-- \catcode`\~13
-- \catcode`\"12
--
-- \def\UTFviiiLoop{%
-- \global\catcode\countUTFx\active
-- \uccode`\~\countUTFx
-- \uppercase\expandafter{\UTFviiiTmp}%
-- \advance\countUTFx by 1
-- \ifnum\countUTFx < \countUTFy
-- \expandafter\UTFviiiLoop
-- \fi}
--
-- \countUTFx = "C2
-- \countUTFy = "E0
-- \def\UTFviiiTmp{%
-- \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
-- \UTFviiiLoop
--
-- \countUTFx = "E0
-- \countUTFy = "F0
-- \def\UTFviiiTmp{%
-- \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
-- \UTFviiiLoop
--
-- \countUTFx = "F0
-- \countUTFy = "F4
-- \def\UTFviiiTmp{%
-- \xdef~{\noexpand\UTFviiiFourOctets\string~}}
-- \UTFviiiLoop
--\endgroup
--
--\begingroup
-- \catcode`\"=12
-- \catcode`\<=12
-- \catcode`\.=12
-- \catcode`\,=12
-- \catcode`\;=12
-- \catcode`\!=12
-- \catcode`\~=13
--
-- \gdef\DeclareUnicodeCharacter#1#2{%
-- \countUTFz = "#1\relax
-- \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
-- \begingroup
-- \parseXMLCharref
-- \def\UTFviiiTwoOctets##1##2{%
-- \csname u8:##1\string ##2\endcsname}%
-- \def\UTFviiiThreeOctets##1##2##3{%
-- \csname u8:##1\string ##2\string ##3\endcsname}%
-- \def\UTFviiiFourOctets##1##2##3##4{%
-- \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
-- \expandafter\expandafter\expandafter\expandafter
-- \expandafter\expandafter\expandafter
-- \gdef\UTFviiiTmp{#2}%
-- \endgroup}
--
-- \gdef\parseXMLCharref{%
-- \ifnum\countUTFz < "A0\relax
-- \errhelp = \EMsimple
-- \errmessage{Cannot define Unicode char value < 00A0}%
-- \else\ifnum\countUTFz < "800\relax
-- \parseUTFviiiA,%
-- \parseUTFviiiB C\UTFviiiTwoOctets.,%
-- \else\ifnum\countUTFz < "10000\relax
-- \parseUTFviiiA;%
-- \parseUTFviiiA,%
-- \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
-- \else
-- \parseUTFviiiA;%
-- \parseUTFviiiA,%
-- \parseUTFviiiA!%
-- \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
-- \fi\fi\fi
-- }
--
-- \gdef\parseUTFviiiA#1{%
-- \countUTFx = \countUTFz
-- \divide\countUTFz by 64
-- \countUTFy = \countUTFz
-- \multiply\countUTFz by 64
-- \advance\countUTFx by -\countUTFz
-- \advance\countUTFx by 128
-- \uccode `#1\countUTFx
-- \countUTFz = \countUTFy}
--
-- \gdef\parseUTFviiiB#1#2#3#4{%
-- \advance\countUTFz by "#10\relax
-- \uccode `#3\countUTFz
-- \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
--\endgroup
--
--\def\utfeightchardefs{%
-- \DeclareUnicodeCharacter{00A0}{\tie}
-- \DeclareUnicodeCharacter{00A1}{\exclamdown}
-- \DeclareUnicodeCharacter{00A3}{\pounds}
-- \DeclareUnicodeCharacter{00A8}{\"{ }}
-- \DeclareUnicodeCharacter{00A9}{\copyright}
-- \DeclareUnicodeCharacter{00AA}{\ordf}
-- \DeclareUnicodeCharacter{00AD}{\-}
-- \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
-- \DeclareUnicodeCharacter{00AF}{\={ }}
--
-- \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
-- \DeclareUnicodeCharacter{00B4}{\'{ }}
-- \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
-- \DeclareUnicodeCharacter{00BA}{\ordm}
-- \DeclareUnicodeCharacter{00BF}{\questiondown}
--
-- \DeclareUnicodeCharacter{00C0}{\`A}
-- \DeclareUnicodeCharacter{00C1}{\'A}
-- \DeclareUnicodeCharacter{00C2}{\^A}
-- \DeclareUnicodeCharacter{00C3}{\~A}
-- \DeclareUnicodeCharacter{00C4}{\"A}
-- \DeclareUnicodeCharacter{00C5}{\AA}
-- \DeclareUnicodeCharacter{00C6}{\AE}
-- \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
-- \DeclareUnicodeCharacter{00C8}{\`E}
-- \DeclareUnicodeCharacter{00C9}{\'E}
-- \DeclareUnicodeCharacter{00CA}{\^E}
-- \DeclareUnicodeCharacter{00CB}{\"E}
-- \DeclareUnicodeCharacter{00CC}{\`I}
-- \DeclareUnicodeCharacter{00CD}{\'I}
-- \DeclareUnicodeCharacter{00CE}{\^I}
-- \DeclareUnicodeCharacter{00CF}{\"I}
--
-- \DeclareUnicodeCharacter{00D1}{\~N}
-- \DeclareUnicodeCharacter{00D2}{\`O}
-- \DeclareUnicodeCharacter{00D3}{\'O}
-- \DeclareUnicodeCharacter{00D4}{\^O}
-- \DeclareUnicodeCharacter{00D5}{\~O}
-- \DeclareUnicodeCharacter{00D6}{\"O}
-- \DeclareUnicodeCharacter{00D8}{\O}
-- \DeclareUnicodeCharacter{00D9}{\`U}
-- \DeclareUnicodeCharacter{00DA}{\'U}
-- \DeclareUnicodeCharacter{00DB}{\^U}
-- \DeclareUnicodeCharacter{00DC}{\"U}
-- \DeclareUnicodeCharacter{00DD}{\'Y}
-- \DeclareUnicodeCharacter{00DF}{\ss}
--
-- \DeclareUnicodeCharacter{00E0}{\`a}
-- \DeclareUnicodeCharacter{00E1}{\'a}
-- \DeclareUnicodeCharacter{00E2}{\^a}
-- \DeclareUnicodeCharacter{00E3}{\~a}
-- \DeclareUnicodeCharacter{00E4}{\"a}
-- \DeclareUnicodeCharacter{00E5}{\aa}
-- \DeclareUnicodeCharacter{00E6}{\ae}
-- \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
-- \DeclareUnicodeCharacter{00E8}{\`e}
-- \DeclareUnicodeCharacter{00E9}{\'e}
-- \DeclareUnicodeCharacter{00EA}{\^e}
-- \DeclareUnicodeCharacter{00EB}{\"e}
-- \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
-- \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
-- \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
-- \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
--
-- \DeclareUnicodeCharacter{00F1}{\~n}
-- \DeclareUnicodeCharacter{00F2}{\`o}
-- \DeclareUnicodeCharacter{00F3}{\'o}
-- \DeclareUnicodeCharacter{00F4}{\^o}
-- \DeclareUnicodeCharacter{00F5}{\~o}
-- \DeclareUnicodeCharacter{00F6}{\"o}
-- \DeclareUnicodeCharacter{00F8}{\o}
-- \DeclareUnicodeCharacter{00F9}{\`u}
-- \DeclareUnicodeCharacter{00FA}{\'u}
-- \DeclareUnicodeCharacter{00FB}{\^u}
-- \DeclareUnicodeCharacter{00FC}{\"u}
-- \DeclareUnicodeCharacter{00FD}{\'y}
-- \DeclareUnicodeCharacter{00FF}{\"y}
--
-- \DeclareUnicodeCharacter{0100}{\=A}
-- \DeclareUnicodeCharacter{0101}{\=a}
-- \DeclareUnicodeCharacter{0102}{\u{A}}
-- \DeclareUnicodeCharacter{0103}{\u{a}}
-- \DeclareUnicodeCharacter{0106}{\'C}
-- \DeclareUnicodeCharacter{0107}{\'c}
-- \DeclareUnicodeCharacter{0108}{\^C}
-- \DeclareUnicodeCharacter{0109}{\^c}
-- \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
-- \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
-- \DeclareUnicodeCharacter{010C}{\v{C}}
-- \DeclareUnicodeCharacter{010D}{\v{c}}
-- \DeclareUnicodeCharacter{010E}{\v{D}}
--
-- \DeclareUnicodeCharacter{0112}{\=E}
-- \DeclareUnicodeCharacter{0113}{\=e}
-- \DeclareUnicodeCharacter{0114}{\u{E}}
-- \DeclareUnicodeCharacter{0115}{\u{e}}
-- \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
-- \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
-- \DeclareUnicodeCharacter{011A}{\v{E}}
-- \DeclareUnicodeCharacter{011B}{\v{e}}
-- \DeclareUnicodeCharacter{011C}{\^G}
-- \DeclareUnicodeCharacter{011D}{\^g}
-- \DeclareUnicodeCharacter{011E}{\u{G}}
-- \DeclareUnicodeCharacter{011F}{\u{g}}
--
-- \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
-- \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
-- \DeclareUnicodeCharacter{0124}{\^H}
-- \DeclareUnicodeCharacter{0125}{\^h}
-- \DeclareUnicodeCharacter{0128}{\~I}
-- \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
-- \DeclareUnicodeCharacter{012A}{\=I}
-- \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
-- \DeclareUnicodeCharacter{012C}{\u{I}}
-- \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
--
-- \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
-- \DeclareUnicodeCharacter{0131}{\dotless{i}}
-- \DeclareUnicodeCharacter{0132}{IJ}
-- \DeclareUnicodeCharacter{0133}{ij}
-- \DeclareUnicodeCharacter{0134}{\^J}
-- \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
-- \DeclareUnicodeCharacter{0139}{\'L}
-- \DeclareUnicodeCharacter{013A}{\'l}
--
-- \DeclareUnicodeCharacter{0141}{\L}
-- \DeclareUnicodeCharacter{0142}{\l}
-- \DeclareUnicodeCharacter{0143}{\'N}
-- \DeclareUnicodeCharacter{0144}{\'n}
-- \DeclareUnicodeCharacter{0147}{\v{N}}
-- \DeclareUnicodeCharacter{0148}{\v{n}}
-- \DeclareUnicodeCharacter{014C}{\=O}
-- \DeclareUnicodeCharacter{014D}{\=o}
-- \DeclareUnicodeCharacter{014E}{\u{O}}
-- \DeclareUnicodeCharacter{014F}{\u{o}}
--
-- \DeclareUnicodeCharacter{0150}{\H{O}}
-- \DeclareUnicodeCharacter{0151}{\H{o}}
-- \DeclareUnicodeCharacter{0152}{\OE}
-- \DeclareUnicodeCharacter{0153}{\oe}
-- \DeclareUnicodeCharacter{0154}{\'R}
-- \DeclareUnicodeCharacter{0155}{\'r}
-- \DeclareUnicodeCharacter{0158}{\v{R}}
-- \DeclareUnicodeCharacter{0159}{\v{r}}
-- \DeclareUnicodeCharacter{015A}{\'S}
-- \DeclareUnicodeCharacter{015B}{\'s}
-- \DeclareUnicodeCharacter{015C}{\^S}
-- \DeclareUnicodeCharacter{015D}{\^s}
-- \DeclareUnicodeCharacter{015E}{\cedilla{S}}
-- \DeclareUnicodeCharacter{015F}{\cedilla{s}}
--
-- \DeclareUnicodeCharacter{0160}{\v{S}}
-- \DeclareUnicodeCharacter{0161}{\v{s}}
-- \DeclareUnicodeCharacter{0162}{\cedilla{t}}
-- \DeclareUnicodeCharacter{0163}{\cedilla{T}}
-- \DeclareUnicodeCharacter{0164}{\v{T}}
--
-- \DeclareUnicodeCharacter{0168}{\~U}
-- \DeclareUnicodeCharacter{0169}{\~u}
-- \DeclareUnicodeCharacter{016A}{\=U}
-- \DeclareUnicodeCharacter{016B}{\=u}
-- \DeclareUnicodeCharacter{016C}{\u{U}}
-- \DeclareUnicodeCharacter{016D}{\u{u}}
-- \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
-- \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
--
-- \DeclareUnicodeCharacter{0170}{\H{U}}
-- \DeclareUnicodeCharacter{0171}{\H{u}}
-- \DeclareUnicodeCharacter{0174}{\^W}
-- \DeclareUnicodeCharacter{0175}{\^w}
-- \DeclareUnicodeCharacter{0176}{\^Y}
-- \DeclareUnicodeCharacter{0177}{\^y}
-- \DeclareUnicodeCharacter{0178}{\"Y}
-- \DeclareUnicodeCharacter{0179}{\'Z}
-- \DeclareUnicodeCharacter{017A}{\'z}
-- \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
-- \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
-- \DeclareUnicodeCharacter{017D}{\v{Z}}
-- \DeclareUnicodeCharacter{017E}{\v{z}}
--
-- \DeclareUnicodeCharacter{01C4}{D\v{Z}}
-- \DeclareUnicodeCharacter{01C5}{D\v{z}}
-- \DeclareUnicodeCharacter{01C6}{d\v{z}}
-- \DeclareUnicodeCharacter{01C7}{LJ}
-- \DeclareUnicodeCharacter{01C8}{Lj}
-- \DeclareUnicodeCharacter{01C9}{lj}
-- \DeclareUnicodeCharacter{01CA}{NJ}
-- \DeclareUnicodeCharacter{01CB}{Nj}
-- \DeclareUnicodeCharacter{01CC}{nj}
-- \DeclareUnicodeCharacter{01CD}{\v{A}}
-- \DeclareUnicodeCharacter{01CE}{\v{a}}
-- \DeclareUnicodeCharacter{01CF}{\v{I}}
--
-- \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
-- \DeclareUnicodeCharacter{01D1}{\v{O}}
-- \DeclareUnicodeCharacter{01D2}{\v{o}}
-- \DeclareUnicodeCharacter{01D3}{\v{U}}
-- \DeclareUnicodeCharacter{01D4}{\v{u}}
--
-- \DeclareUnicodeCharacter{01E2}{\={\AE}}
-- \DeclareUnicodeCharacter{01E3}{\={\ae}}
-- \DeclareUnicodeCharacter{01E6}{\v{G}}
-- \DeclareUnicodeCharacter{01E7}{\v{g}}
-- \DeclareUnicodeCharacter{01E8}{\v{K}}
-- \DeclareUnicodeCharacter{01E9}{\v{k}}
--
-- \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
-- \DeclareUnicodeCharacter{01F1}{DZ}
-- \DeclareUnicodeCharacter{01F2}{Dz}
-- \DeclareUnicodeCharacter{01F3}{dz}
-- \DeclareUnicodeCharacter{01F4}{\'G}
-- \DeclareUnicodeCharacter{01F5}{\'g}
-- \DeclareUnicodeCharacter{01F8}{\`N}
-- \DeclareUnicodeCharacter{01F9}{\`n}
-- \DeclareUnicodeCharacter{01FC}{\'{\AE}}
-- \DeclareUnicodeCharacter{01FD}{\'{\ae}}
-- \DeclareUnicodeCharacter{01FE}{\'{\O}}
-- \DeclareUnicodeCharacter{01FF}{\'{\o}}
--
-- \DeclareUnicodeCharacter{021E}{\v{H}}
-- \DeclareUnicodeCharacter{021F}{\v{h}}
--
-- \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
-- \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
-- \DeclareUnicodeCharacter{0228}{\cedilla{E}}
-- \DeclareUnicodeCharacter{0229}{\cedilla{e}}
-- \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
-- \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
--
-- \DeclareUnicodeCharacter{0232}{\=Y}
-- \DeclareUnicodeCharacter{0233}{\=y}
-- \DeclareUnicodeCharacter{0237}{\dotless{j}}
--
-- \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
-- \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
-- \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
-- \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
-- \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
-- \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
-- \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
-- \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
-- \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
-- \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
-- \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
-- \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
--
-- \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
-- \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
--
-- \DeclareUnicodeCharacter{1E20}{\=G}
-- \DeclareUnicodeCharacter{1E21}{\=g}
-- \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
-- \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
-- \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
-- \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
-- \DeclareUnicodeCharacter{1E26}{\"H}
-- \DeclareUnicodeCharacter{1E27}{\"h}
--
-- \DeclareUnicodeCharacter{1E30}{\'K}
-- \DeclareUnicodeCharacter{1E31}{\'k}
-- \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
-- \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
-- \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
-- \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
-- \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
-- \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
-- \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
-- \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
-- \DeclareUnicodeCharacter{1E3E}{\'M}
-- \DeclareUnicodeCharacter{1E3F}{\'m}
--
-- \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
-- \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
-- \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
-- \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
-- \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
-- \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
-- \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
-- \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
-- \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
-- \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
--
-- \DeclareUnicodeCharacter{1E54}{\'P}
-- \DeclareUnicodeCharacter{1E55}{\'p}
-- \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
-- \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
-- \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
-- \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
-- \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
-- \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
-- \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
-- \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
--
-- \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
-- \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
-- \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
-- \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
-- \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
-- \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
-- \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
-- \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
-- \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
-- \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
--
-- \DeclareUnicodeCharacter{1E7C}{\~V}
-- \DeclareUnicodeCharacter{1E7D}{\~v}
-- \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
-- \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
--
-- \DeclareUnicodeCharacter{1E80}{\`W}
-- \DeclareUnicodeCharacter{1E81}{\`w}
-- \DeclareUnicodeCharacter{1E82}{\'W}
-- \DeclareUnicodeCharacter{1E83}{\'w}
-- \DeclareUnicodeCharacter{1E84}{\"W}
-- \DeclareUnicodeCharacter{1E85}{\"w}
-- \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
-- \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
-- \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
-- \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
-- \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
-- \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
-- \DeclareUnicodeCharacter{1E8C}{\"X}
-- \DeclareUnicodeCharacter{1E8D}{\"x}
-- \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
-- \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
--
-- \DeclareUnicodeCharacter{1E90}{\^Z}
-- \DeclareUnicodeCharacter{1E91}{\^z}
-- \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
-- \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
-- \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
-- \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
-- \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
-- \DeclareUnicodeCharacter{1E97}{\"t}
-- \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
-- \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
--
-- \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
-- \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
--
-- \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
-- \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
-- \DeclareUnicodeCharacter{1EBC}{\~E}
-- \DeclareUnicodeCharacter{1EBD}{\~e}
--
-- \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
-- \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
-- \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
-- \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
--
-- \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
-- \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
--
-- \DeclareUnicodeCharacter{1EF2}{\`Y}
-- \DeclareUnicodeCharacter{1EF3}{\`y}
-- \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
--
-- \DeclareUnicodeCharacter{1EF8}{\~Y}
-- \DeclareUnicodeCharacter{1EF9}{\~y}
--
-- \DeclareUnicodeCharacter{2013}{--}
-- \DeclareUnicodeCharacter{2014}{---}
-- \DeclareUnicodeCharacter{2022}{\bullet}
-- \DeclareUnicodeCharacter{2026}{\dots}
-- \DeclareUnicodeCharacter{20AC}{\euro}
--
-- \DeclareUnicodeCharacter{2192}{\expansion}
-- \DeclareUnicodeCharacter{21D2}{\result}
--
-- \DeclareUnicodeCharacter{2212}{\minus}
-- \DeclareUnicodeCharacter{2217}{\point}
-- \DeclareUnicodeCharacter{2261}{\equiv}
--}% end of \utfeightchardefs
--
--
--% US-ASCII character definitions.
--\def\asciichardefs{% nothing need be done
-- \relax
--}
--
--% Make non-ASCII characters printable again for compatibility with
--% existing Texinfo documents that may use them, even without declaring a
--% document encoding.
--%
--\setnonasciicharscatcode \other
--
--
--\message{formatting,}
--
--\newdimen\defaultparindent \defaultparindent = 15pt
--
--\chapheadingskip = 15pt plus 4pt minus 2pt
--\secheadingskip = 12pt plus 3pt minus 2pt
--\subsecheadingskip = 9pt plus 2pt minus 2pt
--
--% Prevent underfull vbox error messages.
--\vbadness = 10000
--
--% Don't be so finicky about underfull hboxes, either.
--\hbadness = 2000
--
--% Following George Bush, just get rid of widows and orphans.
--\widowpenalty=10000
--\clubpenalty=10000
--
--% Use TeX 3.0's \emergencystretch to help line breaking, but if we're
--% using an old version of TeX, don't do anything. We want the amount of
--% stretch added to depend on the line length, hence the dependence on
--% \hsize. We call this whenever the paper size is set.
--%
--\def\setemergencystretch{%
-- \ifx\emergencystretch\thisisundefined
-- % Allow us to assign to \emergencystretch anyway.
-- \def\emergencystretch{\dimen0}%
-- \else
-- \emergencystretch = .15\hsize
-- \fi
--}
--
--% Parameters in order: 1) textheight; 2) textwidth;
--% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
--% 7) physical page height; 8) physical page width.
--%
--% We also call \setleading{\textleading}, so the caller should define
--% \textleading. The caller should also set \parskip.
--%
--\def\internalpagesizes#1#2#3#4#5#6#7#8{%
-- \voffset = #3\relax
-- \topskip = #6\relax
-- \splittopskip = \topskip
-- %
-- \vsize = #1\relax
-- \advance\vsize by \topskip
-- \outervsize = \vsize
-- \advance\outervsize by 2\topandbottommargin
-- \pageheight = \vsize
-- %
-- \hsize = #2\relax
-- \outerhsize = \hsize
-- \advance\outerhsize by 0.5in
-- \pagewidth = \hsize
-- %
-- \normaloffset = #4\relax
-- \bindingoffset = #5\relax
-- %
-- \ifpdf
-- \pdfpageheight #7\relax
-- \pdfpagewidth #8\relax
-- \fi
-- %
-- \setleading{\textleading}
-- %
-- \parindent = \defaultparindent
-- \setemergencystretch
--}
--
--% @letterpaper (the default).
--\def\letterpaper{{\globaldefs = 1
-- \parskip = 3pt plus 2pt minus 1pt
-- \textleading = 13.2pt
-- %
-- % If page is nothing but text, make it come out even.
-- \internalpagesizes{46\baselineskip}{6in}%
-- {\voffset}{.25in}%
-- {\bindingoffset}{36pt}%
-- {11in}{8.5in}%
--}}
--
--% Use @smallbook to reset parameters for 7x9.25 trim size.
--\def\smallbook{{\globaldefs = 1
-- \parskip = 2pt plus 1pt
-- \textleading = 12pt
-- %
-- \internalpagesizes{7.5in}{5in}%
-- {\voffset}{.25in}%
-- {\bindingoffset}{16pt}%
-- {9.25in}{7in}%
-- %
-- \lispnarrowing = 0.3in
-- \tolerance = 700
-- \hfuzz = 1pt
-- \contentsrightmargin = 0pt
-- \defbodyindent = .5cm
--}}
--
--% Use @smallerbook to reset parameters for 6x9 trim size.
--% (Just testing, parameters still in flux.)
--\def\smallerbook{{\globaldefs = 1
-- \parskip = 1.5pt plus 1pt
-- \textleading = 12pt
-- %
-- \internalpagesizes{7.4in}{4.8in}%
-- {-.2in}{-.4in}%
-- {0pt}{14pt}%
-- {9in}{6in}%
-- %
-- \lispnarrowing = 0.25in
-- \tolerance = 700
-- \hfuzz = 1pt
-- \contentsrightmargin = 0pt
-- \defbodyindent = .4cm
--}}
--
--% Use @afourpaper to print on European A4 paper.
--\def\afourpaper{{\globaldefs = 1
-- \parskip = 3pt plus 2pt minus 1pt
-- \textleading = 13.2pt
-- %
-- % Double-side printing via postscript on Laserjet 4050
-- % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm.
-- % To change the settings for a different printer or situation, adjust
-- % \normaloffset until the front-side and back-side texts align. Then
-- % do the same for \bindingoffset. You can set these for testing in
-- % your texinfo source file like this:
-- % @tex
-- % \global\normaloffset = -6mm
-- % \global\bindingoffset = 10mm
-- % @end tex
-- \internalpagesizes{51\baselineskip}{160mm}
-- {\voffset}{\hoffset}%
-- {\bindingoffset}{44pt}%
-- {297mm}{210mm}%
-- %
-- \tolerance = 700
-- \hfuzz = 1pt
-- \contentsrightmargin = 0pt
-- \defbodyindent = 5mm
--}}
--
--% Use @afivepaper to print on European A5 paper.
--% From romildo at urano.iceb.ufop.br, 2 July 2000.
--% He also recommends making @example and @lisp be small.
--\def\afivepaper{{\globaldefs = 1
-- \parskip = 2pt plus 1pt minus 0.1pt
-- \textleading = 12.5pt
-- %
-- \internalpagesizes{160mm}{120mm}%
-- {\voffset}{\hoffset}%
-- {\bindingoffset}{8pt}%
-- {210mm}{148mm}%
-- %
-- \lispnarrowing = 0.2in
-- \tolerance = 800
-- \hfuzz = 1.2pt
-- \contentsrightmargin = 0pt
-- \defbodyindent = 2mm
-- \tableindent = 12mm
--}}
--
--% A specific text layout, 24x15cm overall, intended for A4 paper.
--\def\afourlatex{{\globaldefs = 1
-- \afourpaper
-- \internalpagesizes{237mm}{150mm}%
-- {\voffset}{4.6mm}%
-- {\bindingoffset}{7mm}%
-- {297mm}{210mm}%
-- %
-- % Must explicitly reset to 0 because we call \afourpaper.
-- \globaldefs = 0
--}}
--
--% Use @afourwide to print on A4 paper in landscape format.
--\def\afourwide{{\globaldefs = 1
-- \afourpaper
-- \internalpagesizes{241mm}{165mm}%
-- {\voffset}{-2.95mm}%
-- {\bindingoffset}{7mm}%
-- {297mm}{210mm}%
-- \globaldefs = 0
--}}
--
--% @pagesizes TEXTHEIGHT[,TEXTWIDTH]
--% Perhaps we should allow setting the margins, \topskip, \parskip,
--% and/or leading, also. Or perhaps we should compute them somehow.
--%
--\parseargdef\pagesizes{\pagesizesyyy #1,,\finish}
--\def\pagesizesyyy#1,#2,#3\finish{{%
-- \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi
-- \globaldefs = 1
-- %
-- \parskip = 3pt plus 2pt minus 1pt
-- \setleading{\textleading}%
-- %
-- \dimen0 = #1
-- \advance\dimen0 by \voffset
-- %
-- \dimen2 = \hsize
-- \advance\dimen2 by \normaloffset
-- %
-- \internalpagesizes{#1}{\hsize}%
-- {\voffset}{\normaloffset}%
-- {\bindingoffset}{44pt}%
-- {\dimen0}{\dimen2}%
--}}
--
--% Set default to letter.
--%
--\letterpaper
--
--
--\message{and turning on texinfo input format.}
--
--% Define macros to output various characters with catcode for normal text.
--\catcode`\"=\other
--\catcode`\~=\other
--\catcode`\^=\other
--\catcode`\_=\other
--\catcode`\|=\other
--\catcode`\<=\other
--\catcode`\>=\other
--\catcode`\+=\other
--\catcode`\$=\other
--\def\normaldoublequote{"}
--\def\normaltilde{~}
--\def\normalcaret{^}
--\def\normalunderscore{_}
--\def\normalverticalbar{|}
--\def\normalless{<}
--\def\normalgreater{>}
--\def\normalplus{+}
--\def\normaldollar{$}%$ font-lock fix
--
--% This macro is used to make a character print one way in \tt
--% (where it can probably be output as-is), and another way in other fonts,
--% where something hairier probably needs to be done.
--%
--% #1 is what to print if we are indeed using \tt; #2 is what to print
--% otherwise. Since all the Computer Modern typewriter fonts have zero
--% interword stretch (and shrink), and it is reasonable to expect all
--% typewriter fonts to have this, we can check that font parameter.
--%
--\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi}
--
--% Same as above, but check for italic font. Actually this also catches
--% non-italic slanted fonts since it is impossible to distinguish them from
--% italic fonts. But since this is only used by $ and it uses \sl anyway
--% this is not a problem.
--\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi}
--
--% Turn off all special characters except @
--% (and those which the user can use as if they were ordinary).
--% Most of these we simply print from the \tt font, but for some, we can
--% use math or other variants that look better in normal text.
--
--\catcode`\"=\active
--\def\activedoublequote{{\tt\char34}}
--\let"=\activedoublequote
--\catcode`\~=\active
--\def~{{\tt\char126}}
--\chardef\hat=`\^
--\catcode`\^=\active
--\def^{{\tt \hat}}
--
--\catcode`\_=\active
--\def_{\ifusingtt\normalunderscore\_}
--\let\realunder=_
--% Subroutine for the previous macro.
--\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
--
--\catcode`\|=\active
--\def|{{\tt\char124}}
--\chardef \less=`\<
--\catcode`\<=\active
--\def<{{\tt \less}}
--\chardef \gtr=`\>
--\catcode`\>=\active
--\def>{{\tt \gtr}}
--\catcode`\+=\active
--\def+{{\tt \char 43}}
--\catcode`\$=\active
--\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
--
--% If a .fmt file is being used, characters that might appear in a file
--% name cannot be active until we have parsed the command line.
--% So turn them off again, and have \everyjob (or @setfilename) turn them on.
--% \otherifyactive is called near the end of this file.
--\def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
--
--% Used sometimes to turn off (effectively) the active characters even after
--% parsing them.
--\def\turnoffactive{%
-- \normalturnoffactive
-- \otherbackslash
--}
--
--\catcode`\@=0
--
--% \backslashcurfont outputs one backslash character in current font,
--% as in \char`\\.
--\global\chardef\backslashcurfont=`\\
--\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
--
--% \realbackslash is an actual character `\' with catcode other, and
--% \doublebackslash is two of them (for the pdf outlines).
--{\catcode`\\=\other @gdef at realbackslash{\} @gdef at doublebackslash{\\}}
--
--% In texinfo, backslash is an active character; it prints the backslash
--% in fixed width font.
--\catcode`\\=\active
-- at def@normalbackslash{{@tt at backslashcurfont}}
--% On startup, @fixbackslash assigns:
--% @let \ = @normalbackslash
--
--% \rawbackslash defines an active \ to do \backslashcurfont.
--% \otherbackslash defines an active \ to be a literal `\' character with
--% catcode other.
-- at gdef@rawbackslash{@let\=@backslashcurfont}
-- at gdef@otherbackslash{@let\=@realbackslash}
--
--% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
--% the literal character `\'.
--%
-- at def@normalturnoffactive{%
-- @let\=@normalbackslash
-- @let"=@normaldoublequote
-- @let~=@normaltilde
-- @let^=@normalcaret
-- @let_=@normalunderscore
-- @let|=@normalverticalbar
-- @let<=@normalless
-- @let>=@normalgreater
-- @let+=@normalplus
-- @let$=@normaldollar %$ font-lock fix
-- @unsepspaces
--}
--
--% Make _ and + \other characters, temporarily.
--% This is canceled by @fixbackslash.
-- at otherifyactive
--
--% If a .fmt file is being used, we don't want the `\input texinfo' to show up.
--% That is what \eatinput is for; after that, the `\' should revert to printing
--% a backslash.
--%
-- at gdef@eatinput input texinfo{@fixbackslash}
-- at global@let\ = @eatinput
--
--% On the other hand, perhaps the file did not have a `\input texinfo'. Then
--% the first `\' in the file would cause an error. This macro tries to fix
--% that, assuming it is called before the first `\' could plausibly occur.
--% Also turn back on active characters that might appear in the input
--% file name, in case not using a pre-dumped format.
--%
-- at gdef@fixbackslash{%
-- @ifx\@eatinput @let\ = @normalbackslash @fi
-- @catcode`+=@active
-- @catcode`@_=@active
--}
--
--% Say @foo, not \foo, in error messages.
-- at escapechar = `@@
--
--% These look ok in all fonts, so just make them not special.
-- at catcode`@& = @other
-- at catcode`@# = @other
-- at catcode`@% = @other
--
--
-- at c Local variables:
-- at c eval: (add-hook 'write-file-hooks 'time-stamp)
-- at c page-delimiter: "^\\\\message"
-- at c time-stamp-start: "def\\\\texinfoversion{"
-- at c time-stamp-format: "%:y-%02m-%02d.%02H"
-- at c time-stamp-end: "}"
-- at c End:
--
-- at c vim:sw=2:
--
-- at ignore
-- arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
-- at end ignore
diff --cc common/status-codes.h
index 20272cb,0000000..337dab7
mode 100644,000000..100644
--- a/common/status-codes.h
+++ b/common/status-codes.h
@@@ -1,224 -1,0 +1,232 @@@
+/* Output of mkstrtable.awk. DO NOT EDIT. */
+
+/* status.h - Status codes
+ * Copyright (C) 2007 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* The purpose of this complex string table is to produce
+ optimal code with a minimum of relocations. */
+
+static const char statusstr_msgstr[] =
+ "ENTER" "\0"
+ "LEAVE" "\0"
+ "ABORT" "\0"
+ "GOODSIG" "\0"
+ "BADSIG" "\0"
+ "ERRSIG" "\0"
+ "BADARMOR" "\0"
+ "TRUST_UNDEFINED" "\0"
+ "TRUST_NEVER" "\0"
+ "TRUST_MARGINAL" "\0"
+ "TRUST_FULLY" "\0"
+ "TRUST_ULTIMATE" "\0"
+ "NEED_PASSPHRASE" "\0"
+ "VALIDSIG" "\0"
+ "SIG_ID" "\0"
+ "ENC_TO" "\0"
+ "NODATA" "\0"
+ "BAD_PASSPHRASE" "\0"
+ "NO_PUBKEY" "\0"
+ "NO_SECKEY" "\0"
+ "NEED_PASSPHRASE_SYM" "\0"
+ "DECRYPTION_INFO" "\0"
+ "DECRYPTION_FAILED" "\0"
+ "DECRYPTION_OKAY" "\0"
+ "MISSING_PASSPHRASE" "\0"
+ "GOOD_PASSPHRASE" "\0"
+ "GOODMDC" "\0"
+ "BADMDC" "\0"
+ "ERRMDC" "\0"
+ "IMPORTED" "\0"
+ "IMPORT_OK" "\0"
+ "IMPORT_PROBLEM" "\0"
+ "IMPORT_RES" "\0"
+ "IMPORT_CHECK" "\0"
+ "EXPORTED" "\0"
+ "EXPORT_RES" "\0"
+ "FILE_START" "\0"
+ "FILE_DONE" "\0"
+ "FILE_ERROR" "\0"
+ "BEGIN_DECRYPTION" "\0"
+ "END_DECRYPTION" "\0"
+ "BEGIN_ENCRYPTION" "\0"
+ "END_ENCRYPTION" "\0"
+ "BEGIN_SIGNING" "\0"
+ "DELETE_PROBLEM" "\0"
+ "GET_BOOL" "\0"
+ "GET_LINE" "\0"
+ "GET_HIDDEN" "\0"
+ "GOT_IT" "\0"
+ "PROGRESS" "\0"
+ "SIG_CREATED" "\0"
+ "SESSION_KEY" "\0"
+ "NOTATION_NAME" "\0"
+ "NOTATION_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"
++ "TOFU_USER" "\0"
++ "TOFU_STATS" "\0"
++ "TOFU_STATS_SHORT" "\0"
++ "TOFU_STATS_LONG" "\0"
+ "TRUNCATED" "\0"
+ "MOUNTPOINT" "\0"
+ "PINENTRY_LAUNCHED" "\0"
+ "PLAINTEXT_FOLLOWS" "\0"
+ "ERROR" "\0"
+ "WARNING" "\0"
+ "SUCCESS" "\0"
+ "FAILURE" "\0"
+ "INQUIRE_MAXLEN";
+
+static const int statusstr_msgidx[] =
+ {
+ 0,
+ 6,
+ 12,
+ 18,
+ 26,
+ 33,
+ 40,
+ 49,
+ 65,
+ 77,
+ 92,
+ 104,
+ 119,
+ 135,
+ 144,
+ 151,
+ 158,
+ 165,
+ 180,
+ 190,
+ 200,
+ 220,
+ 236,
+ 254,
+ 270,
+ 289,
+ 305,
+ 313,
+ 320,
+ 327,
+ 336,
+ 346,
+ 361,
+ 372,
+ 385,
+ 394,
+ 405,
+ 416,
+ 426,
+ 437,
+ 454,
+ 469,
+ 486,
+ 501,
+ 515,
+ 530,
+ 539,
+ 548,
+ 559,
+ 566,
+ 575,
+ 587,
+ 599,
+ 613,
+ 627,
+ 638,
+ 650,
+ 662,
+ 673,
+ 682,
+ 691,
+ 699,
+ 707,
+ 722,
+ 733,
+ 744,
+ 751,
+ 761,
+ 771,
+ 781,
+ 788,
+ 802,
+ 812,
+ 829,
+ 845,
+ 865,
+ 874,
+ 888,
+ 902,
+ 921,
+ 935,
+ 950,
+ 960,
+ 971,
- 989,
- 1007,
- 1013,
- 1021,
- 1029,
- 1037,
++ 988,
++ 1004,
++ 1014,
++ 1025,
++ 1043,
++ 1061,
++ 1067,
++ 1075,
++ 1083,
++ 1091,
+
+ };
+
+#define statusstr_msgidxof(code) (0 ? -1 \
- : ((code >= 0) && (code <= 89)) ? (code - 0) \
++ : ((code >= 0) && (code <= 93)) ? (code - 0) \
+ : -1)
diff --cc doc/defsincdate
index 705121b,0000000..a06ac11
mode 100644,000000..100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@@ -1,1 -1,0 +1,1 @@@
- 1453397451
++1462346658
diff --cc doc/gnupg-card-architecture.pdf
index 7cdd791,0000000..0d04a1a
mode 100644,000000..100644
Binary files differ
diff --cc doc/gnupg-module-overview.pdf
index 0000000,0000000..62742ea
new file mode 100644
Binary files differ
diff --cc doc/gnupg-module-overview.png
index 0000000,0000000..c5c8a30
new file mode 100644
Binary files differ
diff --cc doc/gnupg.info
index 06d08e8,0000000..7ad565b
mode 100644,000000..100644
--- a/doc/gnupg.info
+++ b/doc/gnupg.info
@@@ -1,211 -1,0 +1,213 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.11, January
- 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.12, May 2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+INFO-DIR-SECTION GNU Utilities
+START-INFO-DIR-ENTRY
+* gpg2: (gnupg). OpenPGP encryption and signing tool.
+* gpgsm: (gnupg). S/MIME encryption and signing tool.
+* gpg-agent: (gnupg). The secret key daemon.
+* dirmngr: (gnupg). X.509 CRL and OCSP server.
+* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
+END-INFO-DIR-ENTRY
+
+
+Indirect:
- gnupg.info-1: 972
- gnupg.info-2: 303741
++gnupg.info-1: 968
++gnupg.info-2: 305317
+
+Tag Table:
+(Indirect)
- Node: Top972
- Node: Installation2704
- Node: Invoking GPG-AGENT5053
- Node: Agent Commands6696
- Node: Agent Options7857
- Ref: option --options8014
- Ref: option --homedir8283
- Ref: option --log-file12927
- Ref: option --no-allow-mark-trusted13261
- Ref: option --allow-preset-passphrase13465
- Ref: option --allow-loopback-pinentry13618
- Ref: option --extra-socket20458
- Ref: option --enable-ssh-support20942
- Node: Agent Configuration23294
- Node: Agent Signals28696
- Node: Agent Examples30145
- Node: Agent Protocol30701
- Node: Agent PKDECRYPT32712
- Node: Agent PKSIGN34625
- Node: Agent GENKEY36926
- Node: Agent IMPORT38825
- Node: Agent EXPORT39267
- Node: Agent ISTRUSTED39482
- Node: Agent GET_PASSPHRASE41856
- Node: Agent CLEAR_PASSPHRASE44297
- Node: Agent PRESET_PASSPHRASE44688
- Node: Agent GET_CONFIRMATION45526
- Node: Agent HAVEKEY46198
- Node: Agent LEARN46830
- Node: Agent PASSWD47125
- Node: Agent UPDATESTARTUPTTY47591
- Node: Agent GETEVENTCOUNTER48069
- Node: Agent GETINFO48875
- Node: Agent OPTION49579
- Node: Invoking DIRMNGR51907
- Node: Dirmngr Commands53001
- Node: Dirmngr Options55112
- Ref: Dirmngr Options-Footnote-166878
- Node: Dirmngr Configuration67012
- Node: Dirmngr Signals70225
- Node: Dirmngr Examples71256
- Node: Dirmngr Protocol71938
- Node: Dirmngr LOOKUP72588
- Node: Dirmngr ISVALID73959
- Node: Dirmngr CHECKCRL76529
- Node: Dirmngr CHECKOCSP77585
- Node: Dirmngr CACHECERT78890
- Node: Dirmngr VALIDATE79728
- Node: Invoking GPG80296
- Node: GPG Commands81553
- Node: General GPG Commands82384
- Node: Operational GPG Commands83015
- Ref: option --export-ownertrust97402
- Node: OpenPGP Key Management99508
- Node: GPG Options114733
- Node: GPG Configuration Options116065
- Ref: gpg-option --options128213
- Ref: trust-model-tofu132643
- Node: GPG Key related Options151087
- Node: GPG Input and Output155428
- Node: OpenPGP Options162218
- Node: Compliance Options166358
- Node: GPG Esoteric Options168760
- Ref: GPG Esoteric Options-Footnote-1192189
- Node: Deprecated Options192343
- Node: GPG Configuration193811
- Node: GPG Examples197646
- Node: Unattended Usage of GPG201988
- Node: Unattended GPG key generation202427
- Node: Invoking GPGSM211147
- Node: GPGSM Commands212016
- Node: General GPGSM Commands212454
- Node: Operational GPGSM Commands213142
- Node: Certificate Management215176
- Node: GPGSM Options220114
- Node: Configuration Options220688
- Ref: gpgsm-option --options220957
- Node: Certificate Options224076
- Ref: gpgsm-option --validation-model226983
- Node: Input and Output227963
- Ref: option --p12-charset228546
- Ref: gpgsm-option --with-key-data229790
- Ref: gpgsm-option --with-validation230038
- Node: CMS Options230910
- Node: Esoteric Options231932
- Node: GPGSM Configuration236303
- Node: GPGSM Examples241968
- Node: Unattended Usage242165
- Node: Automated signature checking242756
- Node: CSR and certificate creation244587
- Node: GPGSM Protocol249527
- Node: GPGSM ENCRYPT250785
- Node: GPGSM DECRYPT253455
- Node: GPGSM SIGN254291
- Node: GPGSM VERIFY255738
- Node: GPGSM GENKEY256253
- Node: GPGSM LISTKEYS257268
- Ref: gpgsm-cmd listkeys257427
- Node: GPGSM EXPORT258189
- Node: GPGSM IMPORT259147
- Node: GPGSM DELETE259888
- Node: GPGSM GETAUDITLOG260395
- Ref: gpgsm-cmd getauditlog260566
- Node: GPGSM GETINFO260907
- Node: GPGSM OPTION261756
- Node: Invoking SCDAEMON265103
- Node: Scdaemon Commands265777
- Node: Scdaemon Options266897
- Node: Card applications275748
- Node: OpenPGP Card276413
- Node: NKS Card276886
- Node: DINSIG Card277212
- Node: PKCS#15 Card277588
- Node: Geldkarte Card277858
- Node: SmartCard-HSM278249
- Node: Undefined Card278844
- Node: Scdaemon Configuration279257
- Node: Scdaemon Examples280295
- Node: Scdaemon Protocol280478
- Node: Scdaemon SERIALNO281996
- Node: Scdaemon LEARN282926
- Node: Scdaemon READCERT283782
- Node: Scdaemon READKEY284183
- Node: Scdaemon PKSIGN284469
- Node: Scdaemon PKDECRYPT285195
- Node: Scdaemon GETATTR285944
- Node: Scdaemon SETATTR286148
- Node: Scdaemon WRITEKEY286355
- Node: Scdaemon GENKEY287059
- Node: Scdaemon RANDOM287264
- Node: Scdaemon PASSWD287487
- Node: Scdaemon CHECKPIN287880
- Node: Scdaemon RESTART288885
- Node: Scdaemon APDU289420
- Node: Specify a User ID290395
- Ref: how-to-specify-a-user-id290553
- Node: Helper Tools295442
- Node: watchgnupg296278
- Ref: option watchgnupg --tcp297006
- Node: gpgv298336
- Node: addgnupghome303741
- Node: gpgconf304439
- Ref: gpgconf-Footnote-1306575
- Node: Invoking gpgconf306873
- Node: Format conventions310230
- Node: Listing components315561
- Node: Checking programs317652
- Node: Listing options320399
- Node: Changing options327903
- Node: Listing global options329605
- Node: Files used by gpgconf331381
- Node: applygnupgdefaults331727
- Node: gpg-preset-passphrase332472
- Node: Invoking gpg-preset-passphrase333433
- Node: gpg-connect-agent334703
- Node: Invoking gpg-connect-agent335418
- Node: Controlling gpg-connect-agent338965
- Node: dirmngr-client345438
- Node: gpgparsemail348788
- Node: symcryptrun349106
- Node: Invoking symcryptrun350005
- Node: gpg-zip352517
- Node: Howtos354343
- Node: Howto Create a Server Cert354610
- Node: System Notes363041
- Node: W32 Notes365514
- Node: Debugging365936
- Node: Debugging Tools366765
- Node: kbxutil367045
- Ref: kbxutil-Footnote-1368616
- Node: Debugging Hints368712
- Node: Common Problems369849
- Node: Architecture Details375075
- Node: GnuPG-1 and GnuPG-2375326
- Node: Copying375650
- Node: Contributors413170
- Node: Glossary419411
- Node: Option Index421929
- Node: Index491253
++Node: Top968
++Node: Installation2696
++Node: Invoking GPG-AGENT5045
++Node: Agent Commands6688
++Node: Agent Options7849
++Ref: option --options8006
++Ref: option --homedir8275
++Ref: option --log-file13201
++Ref: option --no-allow-mark-trusted13535
++Ref: option --allow-preset-passphrase13739
++Ref: option --no-allow-loopback-pinentry13892
++Ref: option --extra-socket20798
++Ref: option --enable-ssh-support21282
++Node: Agent Configuration23634
++Node: Agent Signals29036
++Node: Agent Examples30485
++Node: Agent Protocol31041
++Node: Agent PKDECRYPT33052
++Node: Agent PKSIGN34965
++Node: Agent GENKEY37266
++Node: Agent IMPORT39165
++Node: Agent EXPORT39607
++Node: Agent ISTRUSTED39822
++Node: Agent GET_PASSPHRASE42196
++Node: Agent CLEAR_PASSPHRASE44637
++Node: Agent PRESET_PASSPHRASE45028
++Node: Agent GET_CONFIRMATION45866
++Node: Agent HAVEKEY46538
++Node: Agent LEARN47170
++Node: Agent PASSWD47465
++Node: Agent UPDATESTARTUPTTY47931
++Node: Agent GETEVENTCOUNTER48409
++Node: Agent GETINFO49215
++Node: Agent OPTION49919
++Node: Invoking DIRMNGR52280
++Node: Dirmngr Commands53374
++Node: Dirmngr Options55485
++Ref: Dirmngr Options-Footnote-167251
++Node: Dirmngr Configuration67385
++Node: Dirmngr Signals70598
++Node: Dirmngr Examples71629
++Node: Dirmngr Protocol72311
++Node: Dirmngr LOOKUP72961
++Node: Dirmngr ISVALID74332
++Node: Dirmngr CHECKCRL76902
++Node: Dirmngr CHECKOCSP77958
++Node: Dirmngr CACHECERT79263
++Node: Dirmngr VALIDATE80101
++Node: Invoking GPG80669
++Node: GPG Commands81662
++Node: General GPG Commands82492
++Node: Operational GPG Commands83123
++Ref: option --export-ownertrust97596
++Node: OpenPGP Key Management99696
++Node: GPG Options115223
++Node: GPG Configuration Options116554
++Ref: gpg-option --options128857
++Ref: trust-model-tofu133287
++Node: GPG Key related Options151867
++Node: GPG Input and Output156208
++Node: OpenPGP Options163170
++Node: Compliance Options167307
++Node: GPG Esoteric Options169709
++Ref: GPG Esoteric Options-Footnote-1193137
++Node: Deprecated Options193291
++Node: GPG Configuration194759
++Node: GPG Examples198590
++Node: Unattended Usage of GPG202932
++Node: Unattended GPG key generation203371
++Node: Invoking GPGSM212087
++Node: GPGSM Commands212956
++Node: General GPGSM Commands213394
++Node: Operational GPGSM Commands214082
++Node: Certificate Management216116
++Node: GPGSM Options221054
++Node: Configuration Options221628
++Ref: gpgsm-option --options221897
++Node: Certificate Options225016
++Ref: gpgsm-option --validation-model227923
++Node: Input and Output228903
++Ref: option --p12-charset229486
++Ref: gpgsm-option --with-key-data230730
++Ref: gpgsm-option --with-validation230978
++Node: CMS Options231850
++Node: Esoteric Options232872
++Node: GPGSM Configuration237888
++Node: GPGSM Examples243553
++Node: Unattended Usage243750
++Node: Automated signature checking244341
++Node: CSR and certificate creation246172
++Node: GPGSM Protocol251112
++Node: GPGSM ENCRYPT252370
++Node: GPGSM DECRYPT255040
++Node: GPGSM SIGN255876
++Node: GPGSM VERIFY257323
++Node: GPGSM GENKEY257838
++Node: GPGSM LISTKEYS258853
++Ref: gpgsm-cmd listkeys259012
++Node: GPGSM EXPORT259774
++Node: GPGSM IMPORT260732
++Node: GPGSM DELETE261473
++Node: GPGSM GETAUDITLOG261980
++Ref: gpgsm-cmd getauditlog262151
++Node: GPGSM GETINFO262492
++Node: GPGSM OPTION263341
++Node: Invoking SCDAEMON266688
++Node: Scdaemon Commands267362
++Node: Scdaemon Options268482
++Node: Card applications277333
++Node: OpenPGP Card277998
++Node: NKS Card278471
++Node: DINSIG Card278797
++Node: PKCS#15 Card279173
++Node: Geldkarte Card279443
++Node: SmartCard-HSM279834
++Node: Undefined Card280429
++Node: Scdaemon Configuration280842
++Node: Scdaemon Examples281880
++Node: Scdaemon Protocol282063
++Node: Scdaemon SERIALNO283581
++Node: Scdaemon LEARN284511
++Node: Scdaemon READCERT285367
++Node: Scdaemon READKEY285768
++Node: Scdaemon PKSIGN286054
++Node: Scdaemon PKDECRYPT286780
++Node: Scdaemon GETATTR287529
++Node: Scdaemon SETATTR287733
++Node: Scdaemon WRITEKEY287940
++Node: Scdaemon GENKEY288644
++Node: Scdaemon RANDOM288849
++Node: Scdaemon PASSWD289072
++Node: Scdaemon CHECKPIN289465
++Node: Scdaemon RESTART290470
++Node: Scdaemon APDU291005
++Node: Specify a User ID291980
++Ref: how-to-specify-a-user-id292138
++Node: Helper Tools297027
++Node: watchgnupg297863
++Ref: option watchgnupg --tcp298591
++Node: gpgv299921
++Node: addgnupghome305317
++Node: gpgconf306015
++Ref: gpgconf-Footnote-1308151
++Node: Invoking gpgconf308449
++Node: Format conventions311806
++Node: Listing components317137
++Node: Checking programs319228
++Node: Listing options321975
++Node: Changing options329479
++Node: Listing global options331181
++Node: Files used by gpgconf332957
++Node: applygnupgdefaults333303
++Node: gpg-preset-passphrase334048
++Node: Invoking gpg-preset-passphrase335009
++Node: gpg-connect-agent336279
++Node: Invoking gpg-connect-agent336994
++Node: Controlling gpg-connect-agent340541
++Node: dirmngr-client347014
++Node: gpgparsemail350364
++Node: symcryptrun350682
++Node: Invoking symcryptrun351581
++Node: gpg-zip354093
++Node: Howtos355919
++Node: Howto Create a Server Cert356186
++Node: System Notes364617
++Node: W32 Notes367090
++Node: Debugging367512
++Node: Debugging Tools368341
++Node: kbxutil368621
++Ref: kbxutil-Footnote-1370192
++Node: Debugging Hints370288
++Node: Common Problems371425
++Node: Architecture Details376651
++Node: Component interaction376963
++Ref: fig:moduleoverview377151
++Node: GnuPG-1 and GnuPG-2377258
++Ref: fig:cardarchitecture377550
++Node: Copying377665
++Node: Contributors415185
++Node: Glossary421426
++Node: Option Index423944
++Node: Index493550
+
+End Tag Table
diff --cc doc/gnupg.info-1
index 8c63910,0000000..3b263c3
mode 100644,000000..100644
--- a/doc/gnupg.info-1
+++ b/doc/gnupg.info-1
@@@ -1,7439 -1,0 +1,7476 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.11, January
- 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.12, May 2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+INFO-DIR-SECTION GNU Utilities
+START-INFO-DIR-ENTRY
+* gpg2: (gnupg). OpenPGP encryption and signing tool.
+* gpgsm: (gnupg). S/MIME encryption and signing tool.
+* gpg-agent: (gnupg). The secret key daemon.
+* dirmngr: (gnupg). X.509 CRL and OCSP server.
+* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
+END-INFO-DIR-ENTRY
+
+
+File: gnupg.info, Node: Top, Next: Installation, Up: (dir)
+
+Using the GNU Privacy Guard
+***************************
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.11, January
- 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.12, May 2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+
+ This manual documents how to use the GNU Privacy Guard system as well
+as the administration and the architecture.
+
+* Menu:
+
+* Installation:: A short installation guide.
+
+* Invoking GPG-AGENT:: How to launch the secret key daemon.
+* Invoking DIRMNGR:: How to launch the CRL and OCSP daemon.
+* Invoking GPG:: Using the OpenPGP protocol.
+* Invoking GPGSM:: Using the S/MIME protocol.
+* Invoking SCDAEMON:: How to handle Smartcards.
+* Specify a User ID:: How to Specify a User Id.
+
+* Helper Tools:: Description of small helper tools
+
+* Howtos:: How to do certain things.
+* System Notes:: Notes pertaining to certain OSes.
+* Debugging:: How to solve problems
+
+* Copying:: GNU General Public License says
+ how you can copy and share GnuPG
+* Contributors:: People who have contributed to GnuPG.
+
+* Glossary:: Short description of terms used.
+* Option Index:: Index to command line options.
+* 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.
++ testing and should not be used for any production quality keys.
+ This option is only effective when given on the command line.
+
++ On GNU/Linux, another way to quickly generate insecure keys is to
++ use 'rngd' to fill the kernel's entropy pool with lower quality
++ random data. 'rngd' is typically provided by the 'rng-tools'
++ package. It can be run as follows: 'sudo rngd -f -r /dev/urandom'.
++
+'--debug-pinentry'
+ This option enables extra debug information pertaining to the
+ Pinentry. As of now it is only useful when used along with
+ '--debug 1024'.
+
+'--no-detach'
+ Don't detach the process from the console. This is mainly useful
+ for debugging.
+
+'-s'
+'--sh'
+'-c'
+'--csh'
+ Format the info output in daemon mode for use with the standard
+ Bourne shell or the C-shell respectively. The default is to guess
+ it based on the environment variable 'SHELL' which is correct in
+ almost all cases.
+
+'--no-grab'
+ Tell the pinentry not to grab the keyboard and mouse. This option
+ should in general not be used to avoid X-sniffing attacks.
+
+'--log-file FILE'
+ Append all logging output to FILE. This is very helpful in seeing
+ what the agent actually does. If neither a log file nor a log file
+ descriptor has been set on a Windows platform, the Registry entry
+ 'HKCU\Software\GNU\GnuPG:DefaultLogFile', if set, is used to
+ specify the logging output.
+
+'--no-allow-mark-trusted'
+ Do not allow clients to mark keys as trusted, i.e. put them into
+ the 'trustlist.txt' file. This makes it harder for users to
+ inadvertently accept Root-CA keys.
+
+'--allow-preset-passphrase'
+ This option allows the use of 'gpg-preset-passphrase' to seed the
+ internal cache of 'gpg-agent' with passphrases.
+
++'--no-allow-loopback-pinentry'
+'--allow-loopback-pinentry'
- Allow clients to use the loopback pinentry features; see the option
- 'pinentry-mode' for details.
++ Disallow or allow clients to use the loopback pinentry features;
++ see the option 'pinentry-mode' for details. Allow is the default.
+
+'--no-allow-external-cache'
+ Tell Pinentry not to enable features which use an external cache
+ for passphrases.
+
+ Some desktop environments prefer to unlock all credentials with one
+ master password and may have installed a Pinentry which employs an
+ additional external cache to implement such a policy. By using
+ this option the Pinentry is advised not to make use of such a cache
+ and instead always ask the user for the requested passphrase.
+
+'--allow-emacs-pinentry'
+ Tell Pinentry to allow features to divert the passphrase entry to a
+ running Emacs instance. How this is exactly handled depends on the
+ version of the used Pinentry.
+
+'--ignore-cache-for-signing'
+ This option will let 'gpg-agent' bypass the passphrase cache for
+ all signing operation. Note that there is also a per-session
+ option to control this behaviour but this command line option takes
+ precedence.
+
+'--default-cache-ttl N'
+ Set the time a cache entry is valid to N seconds. The default is
+ 600 seconds. Each time a cache entry is accessed, the entry's
+ timer is reset. To set an entry's maximum lifetime, use
+ 'max-cache-ttl'.
+
+'--default-cache-ttl-ssh N'
+ Set the time a cache entry used for SSH keys is valid to N seconds.
+ The default is 1800 seconds. Each time a cache entry is accessed,
+ the entry's timer is reset. To set an entry's maximum lifetime,
+ use 'max-cache-ttl-ssh'.
+
+'--max-cache-ttl N'
+ Set the maximum time a cache entry is valid to N seconds. After
+ this time a cache entry will be expired even if it has been
+ accessed recently or has been set using 'gpg-preset-passphrase'.
+ The default is 2 hours (7200 seconds).
+
+'--max-cache-ttl-ssh N'
+ Set the maximum time a cache entry used for SSH keys is valid to N
+ seconds. After this time a cache entry will be expired even if it
+ has been accessed recently or has been set using
+ 'gpg-preset-passphrase'. The default is 2 hours (7200 seconds).
+
+'--enforce-passphrase-constraints'
+ Enforce the passphrase constraints by not allowing the user to
+ bypass them using the "Take it anyway" button.
+
+'--min-passphrase-len N'
+ Set the minimal length of a passphrase. When entering a new
+ passphrase shorter than this value a warning will be displayed.
+ Defaults to 8.
+
+'--min-passphrase-nonalpha N'
+ Set the minimal number of digits or special characters required in
+ a passphrase. When entering a new passphrase with less than this
+ number of digits or special characters a warning will be displayed.
+ Defaults to 1.
+
+'--check-passphrase-pattern FILE'
+ Check the passphrase against the pattern given in FILE. When
+ entering a new passphrase matching one of these pattern a warning
+ will be displayed. FILE should be an absolute filename. The
+ default is not to use any pattern file.
+
+ Security note: It is known that checking a passphrase against a
+ list of pattern or even against a complete dictionary is not very
+ effective to enforce good passphrases. Users will soon figure up
+ ways to bypass such a policy. A better policy is to educate users
+ on good security behavior and optionally to run a passphrase
+ cracker regularly on all users passphrases to catch the very simple
+ ones.
+
+'--max-passphrase-days N'
+ Ask the user to change the passphrase if N days have passed since
+ the last change. With '--enforce-passphrase-constraints' set the
+ user may not bypass this check.
+
+'--enable-passphrase-history'
+ This option does nothing yet.
+
+'--pinentry-invisible-char CHAR'
+ This option asks the Pinentry to use CHAR for displaying hidden
+ characters. CHAR must be one character UTF-8 string. A Pinentry
+ may or may not honor this request.
+
+'--pinentry-timeout N'
+ This option asks the Pinentry to timeout after N seconds with no
+ user input. The default value of 0 does not ask the pinentry to
+ timeout, however a Pinentry may use its own default timeout value
+ in this case. A Pinentry may or may not honor this request.
+
+'--pinentry-program FILENAME'
+ Use program FILENAME as the PIN entry. The default is installation
+ dependent. With the default configuration the name of the default
+ pinentry is 'pinentry'; if that file does not exist but a
+ 'pinentry-basic' exist the latter is used.
+
+ On a Windows platform the default is to use the first existing
+ program from this list: 'bin\pinentry.exe',
+ '..\Gpg4win\bin\pinentry.exe', '..\Gpg4win\pinentry.exe',
+ '..\GNU\GnuPG\pinentry.exe', '..\GNU\bin\pinentry.exe',
+ 'bin\pinentry-basic.exe' where the file names are relative to the
+ GnuPG installation directory.
+
+'--pinentry-touch-file FILENAME'
+ By default the filename of the socket gpg-agent is listening for
+ requests is passed to Pinentry, so that it can touch that file
+ before exiting (it does this only in curses mode). This option
+ changes the file passed to Pinentry to FILENAME. The special name
+ '/dev/null' may be used to completely disable this feature. Note
+ that Pinentry will not create that file, it will only change the
+ modification and access time.
+
+'--scdaemon-program FILENAME'
+ Use program FILENAME as the Smartcard daemon. The default is
+ installation dependent and can be shown with the 'gpgconf' command.
+
+'--disable-scdaemon'
+ Do not make use of the scdaemon tool. This option has the effect
+ of disabling the ability to do smartcard operations. Note, that
+ enabling this option at runtime does not kill an already forked
+ scdaemon.
+
+'--disable-check-own-socket'
+ 'gpg-agent' employs a periodic self-test to detect a stolen socket.
+ This usually means a second instance of 'gpg-agent' has taken over
+ the socket and 'gpg-agent' will then terminate itself. This option
+ may be used to disable this self-test for debugging purposes.
+
+'--use-standard-socket'
+'--no-use-standard-socket'
+'--use-standard-socket-p'
+ Since GnuPG 2.1 the standard socket is always used. These options
+ have no more effect. The command 'gpg-agent
+ --use-standard-socket-p' will thus always return success.
+
+'--display STRING'
+'--ttyname STRING'
+'--ttytype STRING'
+'--lc-ctype STRING'
+'--lc-messages STRING'
+'--xauthority STRING'
+ These options are used with the server mode to pass localization
+ information.
+
+'--keep-tty'
+'--keep-display'
+ Ignore requests to change the current 'tty' or X window system's
+ 'DISPLAY' variable respectively. This is useful to lock the
+ pinentry to pop up at the 'tty' or display you started the agent.
+
+'--extra-socket NAME'
+ Also listen on native gpg-agent connections on the given socket.
+ The intended use for this extra socket is to setup a Unix domain
+ socket forwarding from a remote machine to this socket on the local
+ machine. A 'gpg' running on the remote machine may then connect to
+ the local gpg-agent and use its private keys. This allows to
+ decrypt or sign data on a remote machine without exposing the
+ 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::.
++ that. To disable this feature use *Note option
++ --no-allow-loopback-pinentry::.
+
+'cache-ttl-opt-preset'
+ This option sets the cache TTL for new entries created by GENKEY
+ and PASSWD commands when using the '--preset' option. It it is not
+ used a default value is used.
+
+'s2k-count'
+ Instead of using the standard S2K count (which is computed on the
+ fly), the given S2K count is used for new keys or when changing the
+ passphrase of a key. Values below 65536 are considered to be 0.
+ This option is valid for the entire session or until reset to 0.
+ This option is useful if the key is later used on boxes which are
+ either much slower or faster than the actual box.
+
+
+File: gnupg.info, Node: Invoking DIRMNGR, Next: Invoking GPG, Prev: Invoking GPG-AGENT, Up: Top
+
+3 Invoking DIRMNGR
+******************
+
+Since version 2.1 of GnuPG, 'dirmngr' takes care of accessing the
+OpenPGP keyservers. As with previous versions it is also used as a
+server for managing and downloading certificate revocation lists (CRLs)
+for X.509 certificates, downloading X.509 certificates, and providing
+access to OCSP providers. Dirmngr is invoked internally by 'gpg',
+'gpgsm', or via the 'gpg-connect-agent' tool.
+
+ For historical reasons it is also possible to start 'dirmngr' in a
+system daemon mode which uses a different directory layout. However,
+this mode is deprecated and may eventually be removed.
+
+*Note Option Index::,for an index to 'DIRMNGR''s commands and options.
+
+* Menu:
+
+* Dirmngr Commands:: List of all commands.
+* Dirmngr Options:: List of all options.
+* Dirmngr Configuration:: Configuration files.
+* Dirmngr Signals:: Use of signals.
+* Dirmngr Examples:: Some usage examples.
+* Dirmngr Protocol:: The protocol dirmngr uses.
+
+
+File: gnupg.info, Node: Dirmngr Commands, Next: Dirmngr Options, Up: Invoking DIRMNGR
+
+3.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help, -h'
+ Print a usage message summarizing the most useful command-line
+ options. Not that you cannot abbreviate this command.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+'--server'
+ Run in server mode and wait for commands on the 'stdin'. The
+ default mode is to create a socket and listen for commands there.
+ This is only used for testing.
+
+'--daemon'
+ Run in background daemon mode and listen for commands on a socket.
+ Note that this also changes the default home directory and enables
+ the internal certificate validation code. This mode is deprecated.
+
+'--list-crls'
+ List the contents of the CRL cache on 'stdout'. This is probably
+ only useful for debugging purposes.
+
+'--load-crl FILE'
+ This command requires a filename as additional argument, and it
+ will make Dirmngr try to import the CRL in FILE into it's cache.
+ Note, that this is only possible if Dirmngr is able to retrieve the
+ CA's certificate directly by its own means. In general it is
+ better to use 'gpgsm''s '--call-dirmngr loadcrl filename' command
+ so that 'gpgsm' can help dirmngr.
+
+'--fetch-crl URL'
+ This command requires an URL as additional argument, and it will
+ make dirmngr try to retrieve an import the CRL from that URL into
+ it's cache. This is mainly useful for debugging purposes. The
+ 'dirmngr-client' provides the same feature for a running dirmngr.
+
+'--shutdown'
+ This commands shuts down an running instance of Dirmngr. This
+ command has currently no effect.
+
+'--flush'
+ This command removes all CRLs from Dirmngr's cache. Client
+ requests will thus trigger reading of fresh CRLs.
+
+
+File: gnupg.info, Node: Dirmngr Options, Next: Dirmngr Configuration, Prev: Dirmngr Commands, Up: Invoking DIRMNGR
+
+3.2 Option Summary
+==================
+
+'--options FILE'
+ Reads configuration from FILE instead of from the default per-user
+ configuration file. The default configuration file is named
+ 'dirmngr.conf' and expected in the home directory.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. This option is only
+ effective when used on the command line. The default depends on
+ the running mode:
+
+ With '--daemon' given on the commandline
+ the directory named '/etc/gnupg' is used for configuration
+ files and '/usr/local/var/cache/gnupg' for cached CRLs.
+
+ Without '--daemon' given on the commandline
+ the directory named '.gnupg' directly below the home directory
+ of the user unless the environment variable 'GNUPGHOME' has
+ been set in which case its value will be used. All kind of
+ data is stored below this directory.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. You can increase the
+ verbosity by giving several verbose commands to DIRMNGR, such as
+ '-vv'.
+
+'--log-file FILE'
+ Append all logging output to FILE. This is very helpful in seeing
+ what the agent actually does.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or by a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ This option is only useful for debugging and the behaviour may
+ change at any time without notice. FLAGS are bit encoded and may
+ be given in usual C-Syntax.
+
+'--debug-all'
+ Same as '--debug=0xffffffff'
+
+'--gnutls-debug LEVEL'
+ Enable debugging of GNUTLS at LEVEL.
+
+'--debug-wait N'
+ When running in server mode, wait N seconds before entering the
+ actual processing loop and print the pid. This gives time to
+ attach a debugger.
+
+'-s'
+'--sh'
+'-c'
+'--csh'
+ Format the info output in daemon mode for use with the standard
+ Bourne shell respective the C-shell . The default ist to guess it
+ based on the environment variable 'SHELL' which is in almost all
+ cases sufficient.
+
+'--force'
+ Enabling this option forces loading of expired CRLs; this is only
+ useful for debugging.
+
+'--use-tor'
+ This option switches Dirmngr and thus GnuPG into "Tor mode" to
+ route all network access via Tor (an anonymity network). WARNING:
+ As of now this still leaks the DNS queries; e.g. to lookup the
+ hosts in a keyserver pool. Certain other features are disabled if
+ this mode is active.
+
+'--keyserver NAME'
+ Use NAME as your keyserver. This is the server that 'gpg'
+ communicates with to receive keys, send keys, and search for keys.
+ The format of the NAME is a URI: 'scheme:[//]keyservername[:port]'
+ The scheme is the type of keyserver: "hkp" for the HTTP (or
+ compatible) keyservers, "ldap" for the LDAP keyservers, or "mailto"
+ for the Graff email keyserver. Note that your particular
+ installation of GnuPG may have other keyserver types available as
+ well. Keyserver schemes are case-insensitive. After the keyserver
+ name, optional keyserver configuration options may be provided.
+ These are the same as the '--keyserver-options' of 'gpg', but apply
+ only to this particular keyserver.
+
+ Most keyservers synchronize with each other, so there is generally
+ no need to send keys to more than one server. The keyserver
+ 'hkp://keys.gnupg.net' uses round robin DNS to give a different
+ keyserver each time you use it.
+
+ If exactly two keyservers are configured and only one is a Tor
+ hidden service (.onion), Dirmngr selects the keyserver to use
+ depending on whether Tor is locally running or not. The check for
+ a running Tor is done for each new connection.
+
+'--nameserver IPADDR'
+ In "Tor mode" Dirmngr uses a public resolver via Tor to resolve DNS
+ names. If the default public resolver, which is '8.8.8.8', shall
+ not be used a different one can be given using this option. Note
+ that a numerical IP address must be given (IPv6 or IPv4) and that
+ no error checking is done for IPADDR. DNS queries in Tor mode do
+ only work if GnuPG as been build with ADNS support.
+
+'--disable-ldap'
+ Entirely disables the use of LDAP.
+
+'--disable-http'
+ Entirely disables the use of HTTP.
+
+'--ignore-http-dp'
+ When looking for the location of a CRL, the to be tested
+ certificate usually contains so called "CRL Distribution Point"
+ (DP) entries which are URLs describing the way to access the CRL.
+ The first found DP entry is used. With this option all entries
+ using the HTTP scheme are ignored when looking for a suitable DP.
+
+'--ignore-ldap-dp'
+ This is similar to '--ignore-http-dp' but ignores entries using the
+ LDAP scheme. Both options may be combined resulting in ignoring
+ DPs entirely.
+
+'--ignore-ocsp-service-url'
+ Ignore all OCSP URLs contained in the certificate. The effect is
+ to force the use of the default responder.
+
+'--honor-http-proxy'
+ If the environment variable 'http_proxy' has been set, use its
+ value to access HTTP servers.
+
+'--http-proxy HOST[:PORT]'
+ Use HOST and PORT to access HTTP servers. The use of this option
+ overrides the environment variable 'http_proxy' regardless whether
+ '--honor-http-proxy' has been set.
+
+'--ldap-proxy HOST[:PORT]'
+ Use HOST and PORT to connect to LDAP servers. If PORT is ommitted,
+ 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.
++'gpg' is the OpenPGP part of the GNU Privacy Guard (GnuPG). It is a tool
++to provide digital encryption and signing services using the OpenPGP
++standard. 'gpg' features complete key management and all bells and
++whistles you can expect from a decent OpenPGP implementation.
+
- 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 that this version of GnuPG features all modern algorithms and
++should thus be preferred over older GnuPG versions. If you are looking
++for version 1 of GnuPG, you may find that version installed under the
++name 'gpg1'.
+
- *Note Option Index::, for an index to 'gpg2''s commands and options.
++ *Note Option Index::, for an index to 'gpg''s commands and options.
+
+* Menu:
+
+* GPG Commands:: List of all commands.
+* GPG Options:: List of all options.
+* GPG Configuration:: Configuration files.
+* GPG Examples:: Some usage examples.
+
+Developer information:
+* Unattended Usage of GPG:: Using 'gpg' from other programs.
+
+
+File: gnupg.info, Node: GPG Commands, Next: GPG Options, Up: Invoking GPG
+
+4.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
- 'gpg2' may be run with no commands, in which case it will perform a
++ 'gpg' may be run with no commands, in which case it will perform a
+reasonable action depending on the type of file it is given as input (an
+encrypted message is decrypted, a signature is verified, a file
+containing keys is listed).
+
+ Please remember that option as well as command parsing stops as soon
+as a non-option is encountered, you can explicitly stop parsing by using
+the special option '--'.
+
+* Menu:
+
+* General GPG Commands:: Commands not specific to the functionality.
+* Operational GPG Commands:: Commands to select the type of operation.
+* OpenPGP Key Management:: How to manage your keys.
+
+
+File: gnupg.info, Node: General GPG Commands, Next: Operational GPG Commands, Up: GPG Commands
+
+4.1.1 Commands not specific to the function
+-------------------------------------------
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help'
+'-h'
+ Print a usage message summarizing the most useful command line
+ options. Note that you cannot abbreviate this command.
+
+'--warranty'
+ Print warranty information.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+
+File: gnupg.info, Node: Operational GPG Commands, Next: OpenPGP Key Management, Prev: General GPG Commands, Up: GPG Commands
+
+4.1.2 Commands to select the type of operation
+----------------------------------------------
+
+'--sign'
+'-s'
+ Make a signature. This command may be combined with '--encrypt'
+ (for a signed and encrypted message), '--symmetric' (for a signed
+ and symmetrically encrypted message), or '--encrypt' and
+ '--symmetric' together (for a signed message that may be decrypted
+ via a secret key or a passphrase). The key to be used for signing
+ is chosen by default or can be set with the '--local-user' and
+ '--default-key' options.
+
+'--clearsign'
+ Make a clear text signature. The content in a clear text signature
+ is readable without any special software. OpenPGP software is only
+ needed to verify the signature. Clear text signatures may modify
+ end-of-line whitespace for platform independence and are not
+ intended to be reversible. The key to be used for signing is
+ chosen by default or can be set with the '--local-user' and
+ '--default-key' options.
+
+'--detach-sign'
+'-b'
+ Make a detached signature.
+
+'--encrypt'
+'-e'
+ Encrypt data. This option may be combined with '--sign' (for a
+ signed and encrypted message), '--symmetric' (for a message that
+ may be decrypted via a secret key or a passphrase), or '--sign' and
+ '--symmetric' together (for a signed message that may be decrypted
+ via a secret key or a passphrase).
+
+'--symmetric'
+'-c'
+ Encrypt with a symmetric cipher using a passphrase. The default
+ symmetric cipher used is AES-128, but may be chosen with the
+ '--cipher-algo' option. This option may be combined with '--sign'
+ (for a signed and symmetrically encrypted message), '--encrypt'
+ (for a message that may be decrypted via a secret key or a
+ passphrase), or '--sign' and '--encrypt' together (for a signed
+ message that may be decrypted via a secret key or a passphrase).
+
+'--store'
+ Store only (make a simple literal data packet).
+
+'--decrypt'
+'-d'
+ Decrypt the file given on the command line (or STDIN if no file is
+ specified) and write it to STDOUT (or the file specified with
+ '--output'). If the decrypted file is signed, the signature is
+ also verified. This command differs from the default operation, as
+ it never writes to the filename which is included in the file and
+ it rejects files which don't begin with an encrypted message.
+
+'--verify'
+ Assume that the first argument is a signed file and verify it
+ without generating any output. With no arguments, the signature
+ packet is read from STDIN. If only a one argument is given, it is
+ expected to be a complete signature.
+
+ With more than 1 argument, the first should be a detached signature
+ and the remaining files 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
++ Note: If the option '--batch' is not used, 'gpg' may assume that a
+ single argument is a file with a detached signature and it will try
+ to find a matching data file by stripping certain suffixes. Using
+ this historical feature to verify a detached signature is strongly
+ discouraged; always specify the data file too.
+
+ Note: When verifying a cleartext signature, 'gpg' verifies only
+ what makes up the cleartext signed data and not any extra data
+ outside of the cleartext signature or header lines following
+ directly the dash marker line. The option '--output' may be used
+ to write out the actual signed data; but there are other pitfalls
+ with this format as well. It is suggested to avoid cleartext
+ signatures in favor of detached signatures.
+
+'--multifile'
+ This modifies certain other commands to accept multiple files for
+ processing on the command line or read from STDIN with each
+ filename on a separate line. This allows for many files to be
+ processed at once. '--multifile' may currently be used along with
+ '--verify', '--encrypt', and '--decrypt'. Note that '--multifile
+ --verify' may not be used with detached signatures.
+
+'--verify-files'
+ Identical to '--multifile --verify'.
+
+'--encrypt-files'
+ Identical to '--multifile --encrypt'.
+
+'--decrypt-files'
+ Identical to '--multifile --decrypt'.
+
+'--list-keys'
+'-k'
+'--list-public-keys'
+ List all keys from the public keyrings, or just the keys given on
+ the command line.
+
+ Avoid using the output of this command in scripts or other programs
+ as it is likely to change as GnuPG changes. See '--with-colons'
+ for a machine-parseable key listing command that is appropriate for
+ use in scripts and other programs.
+
+'--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
++ signing and may thus be used to see what keys 'gpg' might use. In
+ particular external methods as defined by '--auto-key-locate' may
+ be used to locate a key. Only public keys are listed.
+
+'--fingerprint'
+ List all keys (or the specified ones) along with their
+ fingerprints. This is the same output as '--list-keys' but with
+ the additional output of a line with the fingerprint. May also be
+ combined with '--list-sigs' or '--check-sigs'. If this command is
+ given twice, the fingerprints of all secondary keys are listed too.
+
+'--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.
+
+'--export-ssh-key'
+ This command is used to export a key in the OpenSSH public key
+ format. It requires the specification of one key by the usual
+ means and exports the latest valid subkey which has an
+ authentication capability to STDOUT or to the file given with
+ option '--output'. That output can directly be added to ssh's
+ 'authorized_key' file.
+
+ By specifying the key to export using a key ID or a fingerprint
+ suffixed with an exclamation mark (!), a specific subkey or the
+ primary key can be exported. This does not even require that the
+ key has the authentication capability flag set.
+
+'--import'
+'--fast-import'
+ Import/merge keys. This adds the given keys to the keyring. The
+ fast version is currently just a synonym.
+
+ There are a few other options which control how this command works.
+ Most notable here is the '--import-options merge-only' option which
+ does not insert new keys but does only the merging of new
+ signatures, user-IDs and subkeys.
+
+'--recv-keys key IDs'
+ Import the keys with the given key IDs from a keyserver. Option
+ '--keyserver' must be used to give the name of this keyserver.
+
+'--refresh-keys'
+ Request updates from a keyserver for keys that already exist on the
+ local keyring. This is useful for updating a key with the latest
+ signatures, user IDs, etc. Calling this with no arguments will
+ refresh the entire keyring. Option '--keyserver' must be used to
+ give the name of the keyserver for all keys that do not have
+ preferred keyservers set (see '--keyserver-options
+ honor-keyserver-url').
+
+'--search-keys names'
+ Search the keyserver for the given names. Multiple names given
+ here will be joined together to create the search string for the
+ keyserver. Option '--keyserver' must be used to give the name of
+ this keyserver. Keyservers that support different search methods
+ allow using the syntax specified in "How to specify a user ID"
+ below. Note that different keyserver types support different
+ search methods. Currently only LDAP supports them all.
+
+'--fetch-keys URIs'
+ Retrieve keys located at the specified URIs. Note that different
+ installations of GnuPG may support different protocols (HTTP, FTP,
- LDAP, etc.)
++ LDAP, etc.). When using HTTPS the system provided root
++ certificates are used by this command.
+
+'--update-trustdb'
+ Do trust database maintenance. This command iterates over all keys
+ and builds the Web of Trust. This is an interactive command
+ because it may have to ask for the "ownertrust" values for keys.
+ The user has to give an estimation of how far she trusts the owner
+ of the displayed key to correctly certify (sign) other keys. GnuPG
+ only asks for the ownertrust value if it has not yet been assigned
+ to a key. Using the '--edit-key' menu, the assigned value can be
+ changed at any time.
+
+'--check-trustdb'
+ Do trust database maintenance without user interaction. From time
+ to time the trust database must be updated so that expired keys or
+ signatures and the resulting changes in the Web of Trust can be
+ tracked. Normally, GnuPG will calculate when this is required and
+ do it automatically unless '--no-auto-check-trustdb' is set. This
+ command can be used to force a trust database check at any time.
+ The processing is identical to that of '--update-trustdb' but it
+ skips keys with a not yet defined "ownertrust".
+
+ For use with cron jobs, this command can be used together with
+ '--batch' in which case the trust database check is done only if a
+ check is needed. To force a run even in batch mode add the option
+ '--yes'.
+
+'--export-ownertrust'
+ Send the ownertrust values to STDOUT. This is useful for backup
+ purposes as these values are the only ones which can't be
+ re-created from a corrupted trustdb. Example:
- gpg2 --export-ownertrust > otrust.txt
++ gpg --export-ownertrust > otrust.txt
+
+'--import-ownertrust'
+ Update the trustdb with the ownertrust values stored in 'files' (or
+ STDIN if not given); existing values will be overwritten. In case
+ of a severely damaged trustdb and if you have a recent backup of
+ the ownertrust values (e.g. in the file 'otrust.txt', you may
+ re-create the trustdb using these commands:
+ cd ~/.gnupg
+ rm trustdb.gpg
- gpg2 --import-ownertrust < otrust.txt
++ gpg --import-ownertrust < otrust.txt
+
+'--rebuild-keydb-caches'
+ When updating from version 1.0.6 to 1.0.7 this command should be
+ used to create signature caches in the keyring. It might be handy
+ in other situations too.
+
+'--print-md algo'
+'--print-mds'
+ Print message digest of algorithm ALGO for all given files or
+ STDIN. With the second form (or a deprecated "*" as algo) digests
+ for all available algorithms are printed.
+
+'--gen-random 0|1|2 count'
+ Emit COUNT random bytes of the given quality level 0, 1 or 2. If
+ COUNT is not given or zero, an endless sequence of random bytes
+ will be emitted. If used with '--armor' the output will be base64
+ encoded. PLEASE, don't use this command unless you know what you
+ are doing; it may remove precious entropy from the system!
+
+'--gen-prime mode bits'
+ Use the source, Luke :-). The output format is still subject to
+ change.
+
+'--enarmor'
+'--dearmor'
+ Pack or unpack an arbitrary input into/from an OpenPGP ASCII armor.
+ This is a GnuPG extension to OpenPGP and in general not very
+ useful.
+
- '--tofu-set-policy auto|good|unknown|bad|ask key...'
++'--tofu-policy auto|good|unknown|bad|ask key...'
+ Set the TOFU policy for all the bindings associated with the
+ specified keys. For more information about the meaning of the
+ policies, *note trust-model-tofu::. The keys may be specified
+ either by their fingerprint (preferred) or their keyid.
+
+
+File: gnupg.info, Node: OpenPGP Key Management, Prev: Operational GPG Commands, Up: GPG Commands
+
+4.1.3 How to manage your keys
+-----------------------------
+
+This section explains the main commands for key management
+
+'--quick-gen-key user-id'
+ 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. In addition to the
+ key a revocation certificate is created and stored in the
+ 'openpgp-revocs.d' directory below the GnuPG home directory.
+
+'--full-gen-key'
+ Generate a new key pair with dialogs for all options. This is an
+ extended version of '--gen-key'.
+
+ There is also a feature which allows you to create keys in batch
+ mode. See the manual section "Unattended key generation" on how to
+ use this.
+
+'--gen-revoke name'
+ Generate a revocation certificate for the complete key. To only
+ revoke a subkey or a key signature, use the '--edit' command.
+
+ This command merely creates the revocation certificate so that it
+ can be used to revoke the key if that is ever needed. To actually
+ revoke a key the created revocation certificate needs to be merged
+ with the key to revoke. This is done by importing the revocation
+ certificate using the '--import' command. Then the revoked key
+ needs to be published, which is best done by sending the key to a
+ keyserver (command '--send-key') and by exporting ('--export') it
+ to a file which is then send to frequent communication partners.
+
+'--desig-revoke name'
+ Generate a designated revocation certificate for a key. This
+ allows a user (with the permission of the keyholder) to revoke
+ someone else's key.
+
+'--edit-key'
+ Present a menu which enables you to do most of the key management
+ related tasks. It expects the specification of a key on the
+ command line.
+
+ uid 'n'
+ Toggle selection of user ID or photographic user ID with index
+ 'n'. Use '*' to select all and '0' to deselect all.
+
+ key 'n'
+ Toggle selection of subkey with index 'n' or key ID 'n'. Use
+ '*' to select all and '0' to deselect all.
+
+ sign
+ Make a signature on key of user 'name' If the key is not yet
+ signed by the default user (or the users given with -u), the
+ program displays the information of the key again, together
+ with its fingerprint and asks whether it should be signed.
+ This question is repeated for all users specified with -u.
+
+ lsign
+ Same as "sign" but the signature is marked as non-exportable
+ and will therefore never be used by others. This may be used
+ to make keys valid only in the local environment.
+
+ nrsign
+ Same as "sign" but the signature is marked as non-revocable
+ and can therefore never be revoked.
+
+ tsign
+ Make a trust signature. This is a signature that combines the
+ notions of certification (like a regular signature), and trust
+ (like the "trust" command). It is generally only useful in
- distinct communities or groups.
++ distinct communities or groups. For more information please
++ read the sections "Trust Signature" and "Regular Expression"
++ in RFC-4880.
+
+ Note that "l" (for local / non-exportable), "nr" (for
+ non-revocable, and "t" (for trust) may be freely mixed and prefixed
+ to "sign" to create a signature of any type desired.
+
+ If the option '--only-sign-text-ids' is specified, then any
+ non-text based user ids (e.g., photo IDs) will not be selected for
+ signing.
+
+ delsig
+ Delete a signature. Note that it is not possible to retract a
+ signature, once it has been send to the public (i.e. to a
+ keyserver). In that case you better use 'revsig'.
+
+ revsig
+ Revoke a signature. For every signature which has been
+ generated by one of the secret keys, GnuPG asks whether a
+ revocation certificate should be generated.
+
+ check
+ Check the signatures on all selected user IDs. With the extra
+ option 'selfsig' only self-signatures are shown.
+
+ adduid
+ Create an additional user ID.
+
+ addphoto
+ Create a photographic user ID. This will prompt for a JPEG
+ file that will be embedded into the user ID. Note that a very
+ large JPEG will make for a very large key. Also note that
+ some programs will display your JPEG unchanged (GnuPG), and
+ some programs will scale it to fit in a dialog box (PGP).
+
+ showphoto
+ Display the selected photographic user ID.
+
+ deluid
+ Delete a user ID or photographic user ID. Note that it is not
+ possible to retract a user id, once it has been send to the
+ public (i.e. to a keyserver). In that case you better use
+ 'revuid'.
+
+ revuid
+ Revoke a user ID or photographic user ID.
+
+ primary
+ Flag the current user id as the primary one, removes the
+ primary user id flag from all other user ids and sets the
+ timestamp of all affected self-signatures one second ahead.
+ Note that setting a photo user ID as primary makes it primary
+ over other photo user IDs, and setting a regular user ID as
+ primary makes it primary over other regular user IDs.
+
+ keyserver
+ Set a preferred keyserver for the specified user ID(s). This
+ allows other users to know where you prefer they get your key
+ from. See '--keyserver-options honor-keyserver-url' for more
+ on how this works. Setting a value of "none" removes an
+ existing preferred keyserver.
+
+ notation
+ Set a name=value notation for the specified user ID(s). See
+ '--cert-notation' for more on how this works. Setting a value
+ of "none" removes all notations, setting a notation prefixed
+ with a minus sign (-) removes that notation, and setting a
+ notation name (without the =value) prefixed with a minus sign
+ removes all notations with that name.
+
+ pref
+ List preferences from the selected user ID. This shows the
+ actual preferences, without including any implied preferences.
+
+ showpref
+ More verbose preferences listing for the selected user ID.
+ This shows the preferences in effect by including the implied
+ preferences of 3DES (cipher), SHA-1 (digest), and Uncompressed
+ (compression) if they are not already included in the
+ preference list. In addition, the preferred keyserver and
+ signature notations (if any) are shown.
+
+ setpref 'string'
+ Set the list of user ID preferences to 'string' for all (or
+ just the selected) user IDs. Calling setpref with no
+ arguments sets the preference list to the default (either
+ built-in or set via '--default-preference-list'), and calling
+ setpref with "none" as the argument sets an empty preference
- list. Use 'gpg2 --version' to get a list of available
++ list. Use 'gpg --version' to get a list of available
+ algorithms. Note that while you can change the preferences on
+ an attribute user ID (aka "photo ID"), GnuPG does not select
+ keys via attribute user IDs so these preferences will not be
+ used by GnuPG.
+
+ When setting preferences, you should list the algorithms in
+ the order which you'd like to see them used by someone else
+ when encrypting a message to your key. If you don't include
+ 3DES, it will be automatically added at the end. Note that
+ there are many factors that go into choosing an algorithm (for
+ example, your key may not be the only recipient), and so the
+ remote OpenPGP application being used to send to you may or
+ may not follow your exact chosen order for a given message.
+ It will, however, only choose an algorithm that is present on
+ the preference list of every recipient key. See also the
+ INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS section below.
+
+ addkey
+ Add a subkey to this key.
+
+ addcardkey
+ Generate a subkey on a card and add it to this key.
+
+ keytocard
+ Transfer the selected secret subkey (or the primary key if no
+ subkey has been selected) to a smartcard. The secret key in
+ the keyring will be replaced by a stub if the key could be
+ stored successfully on the card and you use the save command
+ later. Only certain key types may be transferred to the card.
+ A sub menu allows you to select on what card to store the key.
+ Note that it is not possible to get that key back from the
+ card - if the card gets broken your secret key will be lost
+ unless you have a backup somewhere.
+
+ bkuptocard 'file'
+ Restore the given file to a card. This command may be used to
+ restore a backup key (as generated during card initialization)
+ to a new card. In almost all cases this will be the
+ encryption key. You should use this command only with the
+ corresponding public key and make sure that the file given as
+ argument is indeed the backup to restore. You should then
+ select 2 to restore as encryption key. You will first be
+ asked to enter the passphrase of the backup key and then for
+ the Admin PIN of the card.
+
+ delkey
+ Remove a subkey (secondary key). Note that it is not possible
+ to retract a subkey, once it has been send to the public (i.e.
+ to a keyserver). In that case you better use 'revkey'.
+
+ revkey
+ Revoke a subkey.
+
+ expire
+ Change the key or subkey expiration time. If a subkey is
+ selected, the expiration time of this subkey will be changed.
+ With no selection, the key expiration of the primary key is
+ changed.
+
+ trust
+ Change the owner trust value for the key. This updates the
+ trust-db immediately and no save is required.
+
+ disable
+ enable
+ Disable or enable an entire key. A disabled key can not
+ normally be used for encryption.
+
+ addrevoker
+ Add a designated revoker to the key. This takes one optional
+ argument: "sensitive". If a designated revoker is marked as
+ sensitive, it will not be exported by default (see
+ export-options).
+
+ passwd
+ Change the passphrase of the secret key.
+
+ toggle
+ This is dummy command which exists only for backward
+ compatibility.
+
+ clean
+ Compact (by removing all signatures except the selfsig) any
+ user ID that is no longer usable (e.g. revoked, or expired).
+ Then, remove any signatures that are not usable by the trust
+ calculations. Specifically, this removes any signature that
+ does not validate, any signature that is superseded by a later
+ signature, revoked signatures, and signatures issued by keys
+ that are not present on the keyring.
+
+ minimize
+ Make the key as small as possible. This removes all
+ signatures from each user ID except for the most recent
+ self-signature.
+
+ cross-certify
+ Add cross-certification signatures to signing subkeys that may
+ not currently have them. Cross-certification signatures
+ protect against a subtle attack against signing subkeys. See
+ '--require-cross-certification'. All new keys generated have
+ this signature by default, so this option is only useful to
+ bring older keys up to date.
+
+ save
+ Save all changes to the key rings and quit.
+
+ quit
+ Quit the program without updating the key rings.
+
+ The listing shows you the key with its secondary keys and all user
+ ids. The primary user id is indicated by a dot, and selected keys
+ or user ids are indicated by an asterisk. The trust value is
+ displayed with the primary key: the first is the assigned owner
+ trust and the second is the calculated trust value. Letters are
+ used for the values:
+
+ -
+ No ownertrust assigned / not yet calculated.
+
+ e
+ Trust calculation has failed; probably due to an expired key.
+
+ q
+ Not enough information for calculation.
+
+ n
+ Never trust this key.
+
+ m
+ Marginally trusted.
+
+ f
+ Fully trusted.
+
+ u
+ Ultimately trusted.
+
+'--sign-key name'
+ Signs a public key with your secret key. This is a shortcut
+ version of the subcommand "sign" from '--edit'.
+
+'--lsign-key name'
+ Signs a public key with your secret key but marks it as
+ non-exportable. This is a shortcut version of the subcommand
+ "lsign" from '--edit-key'.
+
+'--quick-sign-key fpr [names]'
+'--quick-lsign-key fpr [names]'
+ Directly sign a key from the passphrase without any further user
+ interaction. The 'fpr' must be the verified primary fingerprint of
+ a key in the local keyring. If no 'names' are given, all useful
+ user ids are signed; with given ['names'] only useful user ids
- matching one of theses names are signed. 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.
++ matching one of theses names are signed. By default, or if a name
++ is prefixed with a '*', a case insensitive substring match is used.
++ If a name is prefixed with a '=' a case sensitive exact match is
++ done.
++
++ The command '--quick-lsign-key' marks the signatures as
++ non-exportable. If such a non-exportable signature already exists
++ the '--quick-sign-key' turns it into a exportable signature.
+
+ This command uses reasonable defaults and thus does not provide the
+ full flexibility of the "sign" subcommand from '--edit-key'. Its
+ intended use is to help unattended key signing by utilizing a list
+ of verified fingerprints.
+
+'--quick-adduid USER-ID NEW-USER-ID'
+ This command adds a new user id to an existing key. In contrast to
+ the interactive sub-command 'adduid' of '--edit-key' the
+ NEW-USER-ID is added verbatim with only leading and trailing white
+ space removed, it is expected to be UTF-8 encoded, and no checks on
+ its form are applied.
+
+'--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
++'gpg' features a bunch of options to control the exact behaviour and to
+change the default configuration.
+
+* Menu:
+
+* GPG Configuration Options:: How to change the configuration.
+* GPG Key related Options:: Key related options.
+* GPG Input and Output:: Input and Output.
+* OpenPGP Options:: OpenPGP protocol specific options.
+* Compliance Options:: Compliance options.
+* GPG Esoteric Options:: Doing things one usually don't want to do.
+* Deprecated Options:: Deprecated options.
+
+ Long options can be put in an options file (default
+"~/.gnupg/gpg.conf"). Short option names will not work - for example,
+"armor" is a valid option for the options file, while "a" is not. Do
+not write the 2 dashes, but simply the name of the option and any
+required arguments. Lines with a hash ('#') as the first
+non-white-space character are ignored. Commands may be put in this file
+too, but that is not generally useful as the command will execute
+automatically with every execution of gpg.
+
+ Please remember that option parsing stops as soon as a non-option is
+encountered, you can explicitly stop parsing by using the special option
+'--'.
+
+
+File: gnupg.info, Node: GPG Configuration Options, Next: GPG Key related Options, Up: GPG Options
+
+4.2.1 How to change the configuration
+-------------------------------------
+
+These options are used to change the configuration and are usually found
+in the option file.
+
+'--default-key NAME'
+ Use NAME as the default key to sign with. If this option is not
+ used, the default key is the first key found in the secret keyring.
+ Note that '-u' or '--local-user' overrides this option. This
+ option may be given multiple times. In this case, the last key for
+ which a secret key is available is used. If there is no secret key
+ available for any of the specified values, GnuPG will not emit an
+ error message but continue as if this option wasn't given.
+
+'--default-recipient NAME'
+ Use NAME as default recipient if option '--recipient' is not used
+ and don't ask if this is a valid one. NAME must be non-empty.
+
+'--default-recipient-self'
+ Use the default key as default recipient if option '--recipient' is
+ not used and don't ask if this is a valid one. The default key is
+ the first one from the secret keyring or the one set with
+ '--default-key'.
+
+'--no-default-recipient'
+ Reset '--default-recipient' and '--default-recipient-self'.
+
+'-v, --verbose'
+ Give more information during processing. If used twice, the input
+ data is listed in detail.
+
+'--no-verbose'
+ Reset verbose level to 0.
+
+'-q, --quiet'
+ Try to be as quiet as possible.
+
+'--batch'
+'--no-batch'
+ Use batch mode. Never ask, do not allow interactive commands.
+ '--no-batch' disables this option. Note that even with a filename
+ given on the command line, gpg might still need to read from STDIN
+ (in particular if gpg figures that the input is a detached
+ signature and no data file has been specified). Thus if you do not
+ want to feed data via STDIN, you should connect STDIN to
+ '/dev/null'.
+
+'--no-tty'
+ Make sure that the TTY (terminal) is never used for any output.
+ This option is needed in some cases because GnuPG sometimes prints
+ warnings to the TTY even if '--batch' is used.
+
+'--yes'
+ Assume "yes" on most questions.
+
+'--no'
+ Assume "no" on most questions.
+
+'--list-options parameters'
+ This is a space or comma delimited string that gives options used
+ when listing keys and signatures (that is, '--list-keys',
+ '--list-sigs', '--list-public-keys', '--list-secret-keys', and the
+ '--edit-key' functions). Options can be prepended with a 'no-'
+ (after the two dashes) to give the opposite meaning. The options
+ are:
+
+ show-photos
+ Causes '--list-keys', '--list-sigs', '--list-public-keys', and
+ '--list-secret-keys' to display any photo IDs attached to the
+ key. Defaults to no. See also '--photo-viewer'. Does not
+ work with '--with-colons': see '--attribute-fd' for the
+ appropriate way to get photo data for scripts and other
+ frontends.
+
+ show-usage
+ Show usage information for keys and subkeys in the standard
+ key listing. This is a list of letters indicating the allowed
+ usage for a key ('E'=encryption, 'S'=signing,
+ 'C'=certification, 'A'=authentication). Defaults to yes.
+
+ show-policy-urls
+ Show policy URLs in the '--list-sigs' or '--check-sigs'
+ listings. Defaults to no.
+
+ show-notations
+ show-std-notations
+ show-user-notations
+ Show all, IETF standard, or user-defined signature notations
+ in the '--list-sigs' or '--check-sigs' listings. Defaults to
+ no.
+
+ show-keyserver-urls
+ Show any preferred keyserver URL in the '--list-sigs' or
+ '--check-sigs' listings. Defaults to no.
+
+ show-uid-validity
+ Display the calculated validity of user IDs during key
+ listings. Defaults to yes.
+
+ show-unusable-uids
+ Show revoked and expired user IDs in key listings. Defaults
+ to no.
+
+ show-unusable-subkeys
+ Show revoked and expired subkeys in key listings. Defaults to
+ no.
+
+ show-keyring
+ Display the keyring name at the head of key listings to show
+ which keyring a given key resides on. Defaults to no.
+
+ show-sig-expire
+ Show signature expiration dates (if any) during '--list-sigs'
+ or '--check-sigs' listings. Defaults to no.
+
+ show-sig-subpackets
+ Include signature subpackets in the key listing. This option
+ can take an optional argument list of the subpackets to list.
+ If no argument is passed, list all subpackets. Defaults to
+ no. This option is only meaningful when using '--with-colons'
+ along with '--list-sigs' or '--check-sigs'.
+
+'--verify-options parameters'
+ This is a space or comma delimited string that gives options used
+ when verifying signatures. Options can be prepended with a 'no-'
+ to give the opposite meaning. The options are:
+
+ show-photos
+ Display any photo IDs present on the key that issued the
+ signature. Defaults to no. See also '--photo-viewer'.
+
+ show-policy-urls
+ Show policy URLs in the signature being verified. Defaults to
+ yes.
+
+ show-notations
+ show-std-notations
+ show-user-notations
+ Show all, IETF standard, or user-defined signature notations
+ in the signature being verified. Defaults to IETF standard.
+
+ show-keyserver-urls
+ Show any preferred keyserver URL in the signature being
+ verified. Defaults to yes.
+
+ show-uid-validity
+ Display the calculated validity of the user IDs on the key
+ that issued the signature. Defaults to yes.
+
+ show-unusable-uids
+ Show revoked and expired user IDs during signature
+ verification. Defaults to no.
+
+ show-primary-uid-only
+ Show only the primary user ID during signature verification.
+ That is all the AKA lines as well as photo Ids are not shown
+ with the signature verification status.
+
+ pka-lookups
+ Enable PKA lookups to verify sender addresses. Note that PKA
+ is based on DNS, and so enabling this option may disclose
+ information on when and what signatures are verified or to
+ whom data is encrypted. This is similar to the "web bug"
+ described for the auto-key-retrieve 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.
++ With -gen-key and -batch, enable the creation of RSA secret keys as
++ large as 8192 bit. Note: 8192 bit is more than is generally
++ recommended. These large keys don't significantly improve
++ security, but they are more expensive to use, and their signatures
++ and certifications are larger. This option is only available if
++ the binary was build with large-secmem support.
+
+'--enable-dsa2'
+'--disable-dsa2'
+ Enable hash truncation for all DSA keys even for old DSA Keys up to
+ 1024 bit. This is also the default with '--openpgp'. Note that
+ older versions of GnuPG also required this flag to allow the
+ generation of DSA larger than 1024 bit.
+
+'--photo-viewer string'
+ This is the command line that should be run to view a photo ID.
+ "%i" will be expanded to a filename containing the photo. "%I"
+ does the same, except the file will not be deleted once the viewer
+ exits. Other flags are "%k" for the key ID, "%K" for the long key
+ ID, "%f" for the key fingerprint, "%t" for the extension of the
+ image type (e.g. "jpg"), "%T" for the MIME type of the image (e.g.
+ "image/jpeg"), "%v" for the single-character calculated validity of
+ the image being viewed (e.g. "f"), "%V" for the calculated
+ validity as a string (e.g. "full"), "%U" for a base32 encoded hash
+ of the user ID, and "%%" for an actual percent sign. If neither %i
+ or %I are present, then the photo will be supplied to the viewer on
+ standard input.
+
+ The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k'
+ STDIN". Note that if your image viewer program is not secure, then
+ executing it from GnuPG does not make it secure.
+
+'--exec-path string'
+ Sets a list of directories to search for photo viewers and
+ keyserver helpers. If not provided, keyserver helpers use the
+ compiled-in default directory, and photo viewers use the $PATH
+ environment variable. Note, that on W32 system this value is
+ ignored when searching for keyserver helpers.
+
+'--keyring file'
+ Add 'file' to the current list of keyrings. If 'file' begins with
+ a tilde and a slash, these are replaced by the $HOME directory. If
+ the filename does not contain a slash, it is assumed to be in the
+ GnuPG home directory ("~/.gnupg" if '--homedir' or $GNUPGHOME is
+ not used).
+
+ Note that this adds a keyring to the current list. If the intent
+ is to use the specified keyring alone, use '--keyring' along with
+ '--no-default-keyring'.
+
+'--secret-keyring file'
+ This is an obsolete option and ignored. All secret keys are stored
+ in the 'private-keys-v1.d' directory below the GnuPG home
+ directory.
+
+'--primary-keyring file'
+ Designate 'file' as the primary public keyring. This means that
+ newly imported keys (via '--import' or keyserver '--recv-from')
+ will go to this keyring.
+
+'--trustdb-name file'
+ Use 'file' instead of the default trustdb. If 'file' begins with a
+ tilde and a slash, these are replaced by the $HOME directory. If
+ the filename does not contain a slash, it is assumed to be in the
+ GnuPG home directory ('~/.gnupg' if '--homedir' or $GNUPGHOME is
+ not used).
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'--display-charset name'
+ Set the name of the native character set. This is used to convert
+ some informational strings like user IDs to the proper UTF-8
+ encoding. Note that this has nothing to do with the character set
+ of data to be encrypted or signed; GnuPG does not recode
+ user-supplied data. If this option is not used, the default
+ character set is determined from the current locale. A verbosity
+ level of 3 shows the chosen set. Valid values for 'name' are:
+
+ iso-8859-1
+ This is the Latin 1 set.
+
+ iso-8859-2
+ The Latin 2 set.
+
+ iso-8859-15
+ This is currently an alias for the Latin 1 set.
+
+ koi8-r
+ The usual Russian set (rfc1489).
+
+ utf-8
+ Bypass all translations and assume that the OS uses native
+ UTF-8 encoding.
+
+'--utf8-strings'
+'--no-utf8-strings'
+ Assume that command line arguments are given as UTF8 strings. The
+ default ('--no-utf8-strings') is to assume that arguments are
+ encoded in the character set as specified by '--display-charset'.
+ These options affect all following arguments. Both options may be
+ used multiple times.
+
+'--options file'
+ Read options from 'file' and do not try to read them from the
+ default options file in the homedir (see '--homedir'). This option
+ is ignored if used in an options file.
+
+'--no-options'
+ Shortcut for '--options /dev/null'. This option is detected before
+ an attempt to open an option file. Using this option will also
+ prevent the creation of a '~/.gnupg' homedir.
+
+'-z n'
+'--compress-level n'
+'--bzip2-compress-level n'
+ Set compression level to 'n' for the ZIP and ZLIB compression
+ algorithms. The default is to use the default compression level of
+ zlib (normally 6). '--bzip2-compress-level' sets the compression
+ level for the BZIP2 compression algorithm (defaulting to 6 as
+ well). This is a different option from '--compress-level' since
+ BZIP2 uses a significant amount of memory for each additional
+ compression level. '-z' sets both. A value of 0 for 'n' disables
+ compression.
+
+'--bzip2-decompress-lowmem'
+ Use a different decompression method for BZIP2 compressed files.
+ This alternate method uses a bit more than half the memory, but
+ also runs at half the speed. This is useful under extreme low
+ memory circumstances when the file was originally compressed at a
+ high '--bzip2-compress-level'.
+
+'--mangle-dos-filenames'
+'--no-mangle-dos-filenames'
+ Older version of Windows cannot handle filenames with more than one
+ dot. '--mangle-dos-filenames' causes GnuPG to replace (rather than
+ add to) the extension of an output filename to avoid this problem.
+ This option is off by default and has no effect on non-Windows
+ platforms.
+
+'--ask-cert-level'
+'--no-ask-cert-level'
+ When making a key signature, prompt for a certification level. If
+ this option is not specified, the certification level used is set
+ via '--default-cert-level'. See '--default-cert-level' for
+ information on the specific levels and how they are used.
+ '--no-ask-cert-level' disables this option. This option defaults
+ to no.
+
+'--default-cert-level n'
+ The default to use for the check level when signing a key.
+
+ 0 means you make no particular claim as to how carefully you
+ verified the key.
+
+ 1 means you believe the key is owned by the person who claims to
+ own it but you could not, or did not verify the key at all. This
+ is useful for a "persona" verification, where you sign the key of a
+ pseudonymous user.
+
+ 2 means you did casual verification of the key. For example, this
+ could mean that you verified the key fingerprint and checked the
+ user ID on the key against a photo ID.
+
+ 3 means you did extensive verification of the key. For example,
+ this could mean that you verified the key fingerprint with the
+ owner of the key in person, and that you checked, by means of a
+ hard to forge document with a photo ID (such as a passport) that
+ the name of the key owner matches the name in the user ID on the
+ key, and finally that you verified (by exchange of email) that the
+ email address on the key belongs to the key owner.
+
+ Note that the examples given above for levels 2 and 3 are just
+ that: examples. In the end, it is up to you to decide just what
+ "casual" and "extensive" mean to you.
+
+ This option defaults to 0 (no particular claim).
+
+'--min-cert-level'
+ When building the trust database, treat any signatures with a
+ certification level below this as invalid. Defaults to 2, which
+ disregards level 1 signatures. Note that level 0 "no particular
+ claim" signatures are always accepted.
+
+'--trusted-key long key ID'
+ Assume that the specified key (which must be given as a full 8 byte
+ key ID) is as trustworthy as one of your own secret keys. This
+ option is useful if you don't want to keep your secret keys (or one
+ of them) online but still want to be able to check the validity of
+ a given recipient's or signator's key.
+
+'--trust-model pgp|classic|tofu|tofu+pgp|direct|always|auto'
+ Set what trust model GnuPG should follow. The models are:
+
+ pgp
+ This is the Web of Trust combined with trust signatures as
+ used in PGP 5.x and later. This is the default trust model
+ when creating a new trust database.
+
+ classic
+ This is the standard Web of Trust as introduced by PGP 2.
+
+ tofu
+ TOFU stands for Trust On First Use. In this trust model, the
+ first time a key is seen, it is memorized. If later another
+ key is seen with a user id with the same email address, a
+ warning is displayed indicating that there is a conflict and
+ that the key might be a forgery and an attempt at a
+ man-in-the-middle attack.
+
+ Because a potential attacker is able to control the email
+ address and thereby circumvent the conflict detection
+ algorithm by using an email address that is similar in
+ appearance to a trusted email address, whenever a message is
+ verified, statistics about the number of messages signed with
+ the key are shown. In this way, a user can easily identify
+ attacks using fake keys for regular correspondents.
+
+ When compared with the Web of Trust, TOFU offers significantly
+ weaker security guarantees. In particular, TOFU only helps
+ ensure consistency (that is, that the binding between a key
+ and email address doesn't change). A major advantage of TOFU
+ is that it requires little maintenance to use correctly. To
+ use the web of trust properly, you need to actively sign keys
+ and mark users as trusted introducers. This is a
+ time-consuming process and anecdotal evidence suggests that
+ even security-conscious users rarely take the time to do this
+ thoroughly and instead rely on an ad-hoc TOFU process.
+
+ In the TOFU model, policies are associated with bindings
+ between keys and email addresses (which are extracted from
+ user ids and normalized). There are five policies, which can
+ be set manually using the '--tofu-policy' option. The default
+ policy can be set using the '--tofu-default-policy' policy.
+
+ The TOFU policies are: 'auto', 'good', 'unknown', 'bad' and
+ 'ask'. The 'auto' policy is used by default (unless
+ overridden by '--tofu-default-policy') and marks a binding as
+ marginally trusted. The 'good', 'unknown' and 'bad' policies
+ mark a binding as fully trusted, as having unknown trust or as
+ having trust never, respectively. The 'unknown' policy is
+ useful for just using TOFU to detect conflicts, but to never
+ assign positive trust to a binding. The final policy, 'ask'
+ prompts the user to indicate the binding's trust. If batch
+ mode is enabled (or input is inappropriate in the context),
+ then the user is not prompted and the 'undefined' trust level
+ is returned.
+
+ tofu+pgp
+ This trust model combines TOFU with the Web of Trust. This is
+ done by computing the trust level for each model and then
+ taking the maximum trust level where the trust levels are
+ ordered as follows: 'unknown < undefined < marginal < fully <
+ ultimate < expired < never'.
+
+ By setting '--tofu-default-policy=unknown', this model can be
+ used to implement the web of trust with TOFU's conflict
+ detection algorithm, but without its assignment of positive
+ trust values, which some security-conscious users don't like.
+
+ direct
+ Key validity is set directly by the user and not calculated
+ via the Web of Trust.
+
+ always
+ Skip key validation and assume that used keys are always fully
+ valid. You generally won't use this unless you are using some
+ external validation scheme. This option also suppresses the
+ "[uncertain]" tag printed with signature checks when there is
+ no evidence that the user ID is bound to the key. Note that
+ this trust model still does not allow the use of expired,
+ revoked, or disabled keys.
+
+ auto
+ Select the trust model depending on whatever the internal
+ trust database says. This is the default model if such a
+ database already exists.
+
+'--auto-key-locate parameters'
+'--no-auto-key-locate'
+ GnuPG can automatically locate and retrieve keys as needed using
+ this option. This happens when encrypting to an email address (in
+ the "user at example.com" form), and there are no user at example.com
+ keys on the local keyring. This option takes any number of the
+ following mechanisms, in the order they are to be tried:
+
+ cert
+ Locate a key using DNS CERT, as specified in rfc4398.
+
+ pka
+ Locate a key using DNS PKA.
+
+ dane
+ Locate a key using DANE, as specified in
+ draft-ietf-dane-openpgpkey-05.txt.
+
++ wkd
++ Locate a key using the Web Key Directory protocol. This is an
++ experimental method and semantics may change.
++
+ ldap
+ Using DNS Service Discovery, check the domain in question for
+ any LDAP keyservers to use. If this fails, attempt to locate
+ the key using the PGP Universal method of checking
+ 'ldap://keys.(thedomain)'.
+
+ keyserver
+ Locate a key using whatever keyserver is defined using the
+ '--keyserver' option.
+
+ keyserver-URL
+ In addition, a keyserver URL as used in the '--keyserver'
+ option may be used here to query that particular keyserver.
+
+ local
+ Locate the key using the local keyrings. This mechanism
+ allows to select the order a local key lookup is done. Thus
+ using '--auto-key-locate local' is identical to
+ '--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.
++ This is dummy option. 'gpg' always requires the agent.
+
+'--gpg-agent-info'
- This is dummy option. It has no effect when used with 'gpg2'.
++ This is dummy option. It has no effect when used with 'gpg'.
+
+'--agent-program FILE'
+ Specify an agent program to be used for secret key operations. The
+ default value is determined by running 'gpgconf' with the option
+ '--list-dirs'. Note that the pipe symbol ('|') is used for a
+ regression test suite hack and may thus not be used in the file
+ name.
+
+'--dirmngr-program FILE'
+ Specify a dirmngr program to be used for keyserver access. The
+ default value is '/usr/local/bin/dirmngr'. 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'.
++ can sign. Defaults to '--require-cross-certification' for 'gpg'.
+
+'--expert'
+'--no-expert'
+ Allow the user to do certain nonsensical or "silly" things like
+ signing an expired or revoked key, or certain potentially
+ incompatible things like generating unusual key types. This also
+ disables certain warning messages about potentially incompatible
+ actions. As the name implies, this option is for experts only. If
+ you don't fully understand the implications of what it allows you
+ to do, leave this off. '--no-expert' disables this option.
+
+
+File: gnupg.info, Node: GPG Key related Options, Next: GPG Input and Output, Prev: GPG Configuration Options, Up: GPG Options
+
+4.2.2 Key related options
+-------------------------
+
+'--recipient NAME'
+'-r'
+ Encrypt for user id NAME. If this option or '--hidden-recipient'
+ is not specified, GnuPG asks for the user-id unless
+ '--default-recipient' is given.
+
+'--hidden-recipient NAME'
+'-R'
+ Encrypt for user ID NAME, but hide the key ID of this user's key.
+ This option helps to hide the receiver of the message and is a
+ limited countermeasure against traffic analysis. If this option or
+ '--recipient' is not specified, GnuPG asks for the user ID unless
+ '--default-recipient' is given.
+
+'--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-wkd-hash'
++ Print a Web Key Directory indentifier along with each user ID in
++ key listings. This is an experimental feature and semantics may
++ change.
++
+'--with-secret'
+ Include info about the presence of a secret key in public key
+ listings done with '--with-colons'.
+
+
+File: gnupg.info, Node: OpenPGP Options, Next: Compliance Options, Prev: GPG Input and Output, Up: GPG Options
+
+4.2.4 OpenPGP protocol specific options.
+----------------------------------------
+
+'-t, --textmode'
+'--no-textmode'
+ Treat input files as text and store them in the OpenPGP canonical
+ text form with standard "CRLF" line endings. This also sets the
+ necessary flags to inform the recipient that the encrypted or
+ signed data is text and may need its line endings converted back to
+ whatever the local system uses. This option is useful when
+ communicating between two platforms that have different line ending
+ conventions (UNIX-like to Mac, Mac to Windows, etc).
+ '--no-textmode' disables this option, and is the default.
+
+'--force-v3-sigs'
+'--no-force-v3-sigs'
+'--force-v4-certs'
+'--no-force-v4-certs'
+ These options are obsolete and have no effect since GnuPG 2.1.
+
+'--force-mdc'
+ Force the use of encryption with a modification detection code.
+ This is always used with the newer ciphers (those with a blocksize
+ greater than 64 bits), or if all of the recipient keys indicate MDC
+ support in their feature flags.
+
+'--disable-mdc'
+ Disable the use of the modification detection code. Note that by
+ using this option, the encrypted message becomes vulnerable to a
+ message modification attack.
+
+'--personal-cipher-preferences string'
- Set the list of personal cipher preferences to 'string'. Use 'gpg2
++ Set the list of personal cipher preferences to 'string'. Use 'gpg
+ --version' to get a list of available algorithms, and use 'none' to
+ set no preference at all. This allows the user to safely override
+ the algorithm chosen by the recipient key preferences, as GPG will
+ only select an algorithm that is usable by all recipients. The
+ most highly ranked cipher in this list is also used for the
+ '--symmetric' encryption command.
+
+'--personal-digest-preferences string'
- Set the list of personal digest preferences to 'string'. Use 'gpg2
++ Set the list of personal digest preferences to 'string'. Use 'gpg
+ --version' to get a list of available algorithms, and use 'none' to
+ set no preference at all. This allows the user to safely override
+ the algorithm chosen by the recipient key preferences, as GPG will
+ only select an algorithm that is usable by all recipients. The
+ most highly ranked digest algorithm in this list is also used when
+ signing without encryption (e.g. '--clearsign' or '--sign').
+
+'--personal-compress-preferences string'
+ Set the list of personal compression preferences to 'string'. Use
- 'gpg2 --version' to get a list of available algorithms, and use
++ 'gpg --version' to get a list of available algorithms, and use
+ 'none' to set no preference at all. This allows the user to safely
+ override the algorithm chosen by the recipient key preferences, as
+ GPG will only select an algorithm that is usable by all recipients.
+ The most highly ranked compression algorithm in this list is also
+ used when there are no recipient keys to consider (e.g.
+ '--symmetric').
+
+'--s2k-cipher-algo name'
+ Use 'name' as the cipher algorithm for symmetric encryption with a
+ passphrase if '--personal-cipher-preferences' and '--cipher-algo'
+ are not given. The default is AES-128.
+
+'--s2k-digest-algo name'
+ Use 'name' as the digest algorithm used to mangle the passphrases
+ for symmetric encryption. The default is SHA-1.
+
+'--s2k-mode n'
+ Selects how passphrases for symmetric encryption are mangled. If
+ 'n' is 0 a plain passphrase (which is in general not recommended)
+ will be used, a 1 adds a salt (which should not be used) to the
+ passphrase and a 3 (the default) iterates the whole process a
+ number of times (see '--s2k-count').
+
+'--s2k-count n'
+ Specify how many times the passphrases mangling for symmetric
+ encryption is repeated. This value may range between 1024 and
+ 65011712 inclusive. The default is inquired from gpg-agent. Note
+ that not all values in the 1024-65011712 range are legal and if an
+ illegal value is selected, GnuPG will round up to the nearest legal
+ value. This option is only meaningful if '--s2k-mode' is set to
+ the default of 3.
+
+
+File: gnupg.info, Node: Compliance Options, Next: GPG Esoteric Options, Prev: OpenPGP Options, Up: GPG Options
+
+4.2.5 Compliance options
+------------------------
+
+These options control what GnuPG is compliant to. Only one of these
+options may be active at a time. Note that the default setting of this
+is nearly always the correct one. See the INTEROPERABILITY WITH OTHER
+OPENPGP PROGRAMS section below before using one of these options.
+
+'--gnupg'
+ Use standard GnuPG behavior. This is essentially OpenPGP behavior
+ (see '--openpgp'), but with some additional workarounds for common
+ compatibility problems in different versions of PGP. This is the
+ default option, so it is not generally needed, but it may be useful
+ to override a different compliance option in the gpg.conf file.
+
+'--openpgp'
+ Reset all packet, cipher and digest options to strict OpenPGP
+ behavior. Use this option to reset all previous options like
+ '--s2k-*', '--cipher-algo', '--digest-algo' and '--compress-algo'
+ to OpenPGP compliant values. All PGP workarounds are disabled.
+
+'--rfc4880'
+ Reset all packet, cipher and digest options to strict RFC-4880
+ behavior. Note that this is currently the same thing as
+ '--openpgp'.
+
+'--rfc2440'
+ Reset all packet, cipher and digest options to strict RFC-2440
+ behavior.
+
+'--pgp6'
+ Set up all options to be as PGP 6 compliant as possible. This
+ restricts you to the ciphers IDEA (if the IDEA plugin is
+ installed), 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160,
+ and the compression algorithms none and ZIP. This also disables
+ -throw-keyids, and making signatures with signing subkeys as PGP 6
+ does not understand signatures made by signing subkeys.
+
+ This option implies '--disable-mdc --escape-from-lines'.
+
+'--pgp7'
+ Set up all options to be as PGP 7 compliant as possible. This is
+ identical to '--pgp6' except that MDCs are not disabled, and the
+ list of allowable ciphers is expanded to add AES128, AES192,
+ AES256, and TWOFISH.
+
+'--pgp8'
+ Set up all options to be as PGP 8 compliant as possible. PGP 8 is
+ a lot closer to the OpenPGP standard than previous versions of PGP,
+ so all this does is disable '--throw-keyids' and set
+ '--escape-from-lines'. All algorithms are allowed except for the
+ SHA224, SHA384, and SHA512 digests.
+
+
+File: gnupg.info, Node: GPG Esoteric Options, Next: Deprecated Options, Prev: Compliance Options, Up: GPG Options
+
+4.2.6 Doing things one usually doesn't want to do.
+--------------------------------------------------
+
+'-n'
+'--dry-run'
+ Don't make any changes (this is not completely implemented).
+
+'--list-only'
+ Changes the behaviour of some commands. This is like '--dry-run'
+ but different in some cases. The semantic of this command may be
+ extended in the future. Currently it only skips the actual
+ decryption pass and therefore enables a fast listing of the
+ encryption keys.
+
+'-i'
+'--interactive'
+ Prompt before overwriting any files.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or by a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ Set debugging flags. All flags are or-ed and FLAGS may be given in
+ C syntax (e.g. 0x0042) or as a comma separated list of flag names.
+ To get a list of all supported flags the single word "help" can be
+ used.
+
+'--debug-all'
+ Set all useful debugging flags.
+
+'--debug-iolbf'
+ Set stdout into line buffered mode. This option is only honored
+ when given on the command line.
+
+'--faked-system-time EPOCH'
+ This option is only useful for testing; it sets the system time
+ back or forth to EPOCH which is the number of seconds elapsed since
+ the year 1970. Alternatively EPOCH may be given as a full ISO time
+ string (e.g. "20070924T154812").
+
+'--enable-progress-filter'
+ Enable certain PROGRESS status outputs. This option allows
+ frontends to display a progress indicator while gpg is processing
+ larger files. There is a slight performance overhead using it.
+
+'--status-fd n'
+ Write special status strings to the file descriptor 'n'. See the
+ file DETAILS in the documentation for a listing of them.
+
+'--status-file file'
+ Same as '--status-fd', except the status data is written to file
+ 'file'.
+
+'--logger-fd n'
+ Write log output to file descriptor 'n' and not to STDERR.
+
+'--log-file file'
+'--logger-file file'
+ Same as '--logger-fd', except the logger data is written to file
+ 'file'. Note that '--log-file' is only implemented for GnuPG-2.
+
+'--attribute-fd n'
+ Write attribute subpackets to the file descriptor 'n'. This is
+ most useful for use with '--status-fd', since the status messages
+ are needed to separate out the various subpackets from the stream
+ delivered to the file descriptor.
+
+'--attribute-file file'
+ Same as '--attribute-fd', except the attribute data is written to
+ file 'file'.
+
+'--comment string'
+'--no-comments'
+ Use 'string' as a comment string in clear text signatures and ASCII
+ armored messages or keys (see '--armor'). The default behavior is
+ not to use a comment string. '--comment' may be repeated multiple
+ times to get multiple comment strings. '--no-comments' removes all
+ comments. It is a good idea to keep the length of a single comment
+ below 60 characters to avoid problems with mail programs wrapping
+ such lines. Note that comment lines, like all other header lines,
+ are not protected by the signature.
+
+'--emit-version'
+'--no-emit-version'
+ Force inclusion of the version string in ASCII armored output. If
+ given once only the name of the program and the major number is
+ emitted (default), given twice the minor is also emitted, given
+ triple the micro is added, and given quad an operating system
+ identification is also emitted. '--no-emit-version' disables the
+ 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
++ Specify how many times 'gpg' will request a new passphrase be
+ repeated. This is useful for helping memorize a passphrase.
+ Defaults to 1 repetition.
+
+'--passphrase-fd n'
+ Read the passphrase from file descriptor 'n'. Only the first line
+ will be read from file descriptor 'n'. If you use 0 for 'n', the
+ passphrase will be read from STDIN. This can only be used if only
+ one passphrase is supplied.
+
+ Note that this passphrase is only used if the option '--batch' has
+ also been given. This is different from GnuPG version 1.x.
+
+'--passphrase-file file'
+ Read the passphrase from file 'file'. Only the first line will be
+ read from file 'file'. This can only be used if only one
+ passphrase is supplied. Obviously, a passphrase stored in a file
+ is of questionable security if other users can read this file.
+ Don't use this option if you can avoid it. Note that this
+ passphrase is only used if the option '--batch' has also been
+ given. This is different from GnuPG version 1.x.
+
+'--passphrase string'
+ Use 'string' as the passphrase. This can only be used if only one
+ passphrase is supplied. Obviously, this is of very questionable
+ security on a multi-user system. Don't use this option if you can
+ avoid it. Note that this passphrase is only used if the option
+ '--batch' has also been given. This is different from GnuPG
+ version 1.x.
+
+'--pinentry-mode mode'
+ Set the pinentry mode to 'mode'. Allowed values for 'mode' are:
+ default
+ Use the default of the agent, which is 'ask'.
+ ask
+ Force the use of the Pinentry.
+ cancel
+ Emulate use of Pinentry's cancel button.
+ error
+ Return a Pinentry error ("No Pinentry").
+ loopback
+ Redirect Pinentry queries to the caller. Note that in
+ contrast to Pinentry the user is not prompted again if he
+ enters a bad password.
+
+'--command-fd n'
+ This is a replacement for the deprecated shared-memory IPC mode.
+ If this option is enabled, user input on questions is not expected
+ from the TTY but from the given file descriptor. It should be used
+ together with '--status-fd'. See the file doc/DETAILS in the
+ source distribution for details on how to use it.
+
+'--command-file file'
+ Same as '--command-fd', except the commands are read out of file
+ 'file'
+
+'--allow-non-selfsigned-uid'
+'--no-allow-non-selfsigned-uid'
+ Allow the import and use of keys with user IDs which are not
+ self-signed. This is not recommended, as a non self-signed user ID
+ is trivial to forge. '--no-allow-non-selfsigned-uid' disables.
+
+'--allow-freeform-uid'
+ Disable all checks on the form of the user ID while generating a
+ new one. This option should only be used in very special
+ environments as it does not ensure the de-facto standard format of
+ user IDs.
+
+'--ignore-time-conflict'
+ GnuPG normally checks that the timestamps associated with keys and
+ signatures have plausible values. However, sometimes a signature
+ seems to be older than the key due to clock problems. This option
+ makes these checks just a warning. See also '--ignore-valid-from'
+ for timestamp issues on subkeys.
+
+'--ignore-valid-from'
+ GnuPG normally does not select and use subkeys created in the
+ future. This option allows the use of such keys and thus exhibits
+ the pre-1.0.7 behaviour. You should not use this option unless
+ there is some clock problem. See also '--ignore-time-conflict' for
+ timestamp issues with signatures.
+
+'--ignore-crc-error'
+ The ASCII armor used by OpenPGP is protected by a CRC checksum
+ against transmission errors. Occasionally the CRC gets mangled
+ somewhere on the transmission channel but the actual content (which
+ is protected by the OpenPGP protocol anyway) is still okay. This
+ option allows GnuPG to ignore CRC errors.
+
+'--ignore-mdc-error'
+ This option changes a MDC integrity protection failure into a
+ warning. This can be useful if a message is partially corrupt, but
+ it is necessary to get as much data as possible out of the corrupt
+ message. However, be aware that a MDC protection failure may also
+ mean that the message was tampered with intentionally by an
+ attacker.
+
+'--allow-weak-digest-algos'
+ Signatures made with known-weak digest algorithms are normally
+ rejected with an "invalid digest algorithm" message. This option
+ allows the verification of signatures made with such weak
+ algorithms. MD5 is the only digest algorithm considered weak by
+ default. See also '--weak-digest' to reject other digest
+ algorithms.
+
+'--weak-digest name'
+ Treat the specified digest algorithm as weak. Signatures made over
+ weak digests algorithms are normally rejected. This option can be
+ supplied multiple times if multiple algorithms should be considered
+ weak. See also '--allow-weak-digest-algos' to disable rejection of
+ weak digests. MD5 is always considered weak, and does not need to
+ be listed explicitly.
+
+'--no-default-keyring'
+ Do not add the default keyrings to the list of keyrings. Note that
+ GnuPG will not operate without any keyrings, so if you use this
+ option and do not provide alternate keyrings via '--keyring' or
+ '--secret-keyring', then GnuPG will still use the default public or
+ secret keyrings.
+
+'--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
++'gpg''s operation. Unless noted, they are expected in the current home
+directory (*note option --homedir::).
+
+'gpg.conf'
- This is the standard configuration file read by 'gpg2' on startup.
++ This is the standard configuration file read by 'gpg' on startup.
+ It may contain any valid long option; the leading two dashes may
+ not be entered and the option may not be abbreviated. This default
+ name may be changed on the command line (*note gpg-option
+ --options::). You should backup this file.
+
+ Note that on larger installations, it is useful to put predefined
+files into the directory '/etc/skel/.gnupg' so that newly created users
+start up with a working configuration. For existing users a small
+helper script is provided to create these files (*note addgnupghome::).
+
- For internal purposes 'gpg2' creates and maintains a few other files;
++ For internal purposes 'gpg' creates and maintains a few other files;
+They all live in in the current home directory (*note option
- --homedir::). Only the 'gpg2' program may modify these files.
++--homedir::). Only the 'gpg' 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'.
++ returned by running the command 'gpg --gpgconf-list'.
+
+Key-Grip: HEXSTRING
+ This is optional and used to generate a CSR or certificate for an
+ already existing key. Key-Length will be ignored when given.
+
+Key-Usage: USAGE-LIST
+ Space or comma delimited list of key usages. Allowed values are
+ 'encrypt', 'sign', and 'auth'. This is used to generate the key
+ flags. Please make sure that the algorithm is capable of this
+ usage. Note that OpenPGP requires that all primary keys are
+ capable of certification, so no matter what usage is given here,
+ the 'cert' flag will be on. If no 'Key-Usage' is specified and the
+ 'Key-Type' is not 'default', all allowed usages for that particular
+ algorithm are used; if it is not given but 'default' is used the
+ usage will be 'sign'.
+
+Subkey-Type: ALGO
+ This generates a secondary key (subkey). Currently only one subkey
+ can be handled. See also 'Key-Type' above.
+
+Subkey-Length: NBITS
+ Length of the secondary key (subkey) in bits. The default is
- returned by running the command 'gpg2 --gpgconf-list'".
++ returned by running the command 'gpg --gpgconf-list'".
+
+Subkey-Usage: USAGE-LIST
+ Key usage lists for a subkey; similar to 'Key-Usage'.
+
+Passphrase: STRING
+ If you want to specify a passphrase for the secret key, enter it
+ here. Default is to use the Pinentry dialog to ask for a
+ passphrase.
+
+Name-Real: NAME
+Name-Comment: COMMENT
+Name-Email: EMAIL
+ The three parts of a user name. Remember to use UTF-8 encoding
+ here. If you don't give any of them, no user ID is created.
+
+Expire-Date: ISO-DATE|(NUMBER[d|w|m|y])
+ Set the expiration date for the key (and the subkey). It may
+ either be entered in ISO date format (e.g. "20000815T145012") or
+ as number of days, weeks, month or years after the creation date.
+ The special notation "seconds=N" is also allowed to specify a
+ number of seconds since creation. Without a letter days are
+ assumed. Note that there is no check done on the overflow of the
+ type used by OpenPGP for timestamps. Thus you better make sure
+ that the given value make sense. Although OpenPGP works with time
+ intervals, GnuPG uses an absolute value internally and thus the
+ last year we can represent is 2105.
+
+Creation-Date: ISO-DATE
+ Set the creation date of the key as stored in the key information
+ and which is also part of the fingerprint calculation. Either a
+ date like "1986-04-26" or a full timestamp like "19860426T042640"
+ may be used. The time is considered to be UTC. The special
+ notation "seconds=N" may be used to directly specify a the number
+ of seconds since Epoch (Unix time). If it is not given the current
+ time is used.
+
+Preferences: STRING
+ Set the cipher, hash, and compression preference values for this
+ key. This expects the same type of string as the sub-command
+ 'setpref' in the '--edit-key' menu.
+
+Revoker: ALGO:FPR [sensitive]
+ Add a designated revoker to the generated key. Algo is the public
+ key algorithm of the designated revoker (i.e. RSA=1, DSA=17, etc.)
+ FPR is the fingerprint of the designated revoker. The optional
+ 'sensitive' flag marks the designated revoker as sensitive
+ information. Only v4 keys may be designated revokers.
+
+Keyserver: STRING
+ This is an optional parameter that specifies the preferred
+ keyserver URL for the key.
+
+Handle: STRING
+ This is an optional parameter only used with the status lines
+ KEY_CREATED and KEY_NOT_CREATED. STRING may be up to 100 characters
+ and should not contain spaces. It is useful for batch key
+ generation to associate a key parameter block with a status line.
+
+Here is an example on how to create a key:
+ $ cat >foo <<EOF
+ %echo Generating a basic OpenPGP key
+ Key-Type: DSA
+ Key-Length: 1024
+ Subkey-Type: ELG-E
+ Subkey-Length: 1024
+ Name-Real: Joe Tester
+ Name-Comment: with stupid passphrase
+ Name-Email: joe at foo.bar
+ Expire-Date: 0
+ Passphrase: abc
+ %pubring foo.pub
+ %secring foo.sec
+ # Do a commit here, so that we can later print "done" :-)
+ %commit
+ %echo done
+ EOF
- $ gpg2 --batch --gen-key foo
++ $ gpg --batch --gen-key foo
+ [...]
- $ gpg2 --no-default-keyring --secret-keyring ./foo.sec \
++ $ gpg --no-default-keyring --secret-keyring ./foo.sec \
+ --keyring ./foo.pub --list-secret-keys
+ /home/wk/work/gnupg-stable/scratch/foo.sec
+ ------------------------------------------
+ sec 1024D/915A878D 2000-03-09 Joe Tester (with stupid passphrase) <joe at foo.bar>
+ ssb 1024g/8F70E2C0 2000-03-09
+
+If you want to create a key with the default algorithms you would use
+these parameters:
+ %echo Generating a default key
+ Key-Type: default
+ Subkey-Type: default
+ Name-Real: Joe Tester
+ Name-Comment: with stupid passphrase
+ Name-Email: joe at foo.bar
+ Expire-Date: 0
+ Passphrase: abc
+ %pubring foo.pub
+ %secring foo.sec
+ # Do a commit here, so that we can later print "done" :-)
+ %commit
+ %echo done
+
+
+File: gnupg.info, Node: Invoking GPGSM, Next: Invoking SCDAEMON, Prev: Invoking GPG, Up: Top
+
+5 Invoking GPGSM
+****************
+
+'gpgsm' is a tool similar to 'gpg' to provide digital encryption and
+signing services on X.509 certificates and the CMS protocol. It is
+mainly used as a backend for S/MIME mail processing. 'gpgsm' includes a
+full featured certificate management and complies with all rules defined
+for the German Sphinx project.
+
+ *Note Option Index::, for an index to 'GPGSM''s commands and options.
+
+* Menu:
+
+* GPGSM Commands:: List of all commands.
+* GPGSM Options:: List of all options.
+* GPGSM Configuration:: Configuration files.
+* GPGSM Examples:: Some usage examples.
+
+Developer information:
+* Unattended Usage:: Using 'gpgsm' from other programs.
+* GPGSM Protocol:: The protocol the server mode uses.
+
+
+File: gnupg.info, Node: GPGSM Commands, Next: GPGSM Options, Up: Invoking GPGSM
+
+5.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+* Menu:
+
+* General GPGSM Commands:: Commands not specific to the functionality.
+* Operational GPGSM Commands:: Commands to select the type of operation.
+* Certificate Management:: How to manage certificates.
+
+
+File: gnupg.info, Node: General GPGSM Commands, Next: Operational GPGSM Commands, Up: GPGSM Commands
+
+5.1.1 Commands not specific to the function
+-------------------------------------------
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help, -h'
+ Print a usage message summarizing the most useful command-line
+ options. Note that you cannot abbreviate this command.
+
+'--warranty'
+ Print warranty information. Note that you cannot abbreviate this
+ command.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+
+File: gnupg.info, Node: Operational GPGSM Commands, Next: Certificate Management, Prev: General GPGSM Commands, Up: GPGSM Commands
+
+5.1.2 Commands to select the type of operation
+----------------------------------------------
+
+'--encrypt'
+ Perform an encryption. The keys the data is encrypted too must be
+ set using the option '--recipient'.
+
+'--decrypt'
+ Perform a decryption; the type of input is automatically
+ determined. It may either be in binary form or PEM encoded;
+ automatic determination of base-64 encoding is not done.
+
+'--sign'
+ Create a digital signature. The key used is either the fist one
+ found in the keybox or those set with the '--local-user' option.
+
+'--verify'
+ Check a signature file for validity. Depending on the arguments a
+ detached signature may also be checked.
+
+'--server'
+ Run in server mode and wait for commands on the 'stdin'.
+
+'--call-dirmngr COMMAND [ARGS]'
+ Behave as a Dirmngr client issuing the request COMMAND with the
+ optional list of ARGS. The output of the Dirmngr is printed
+ stdout. Please note that file names given as arguments should have
+ an absolute file name (i.e. commencing with '/' because they are
+ passed verbatim to the Dirmngr and the working directory of the
+ Dirmngr might not be the same as the one of this client. Currently
+ it is not possible to pass data via stdin to the Dirmngr. COMMAND
+ should not contain spaces.
+
+ This is command is required for certain maintaining tasks of the
+ dirmngr where a dirmngr must be able to call back to 'gpgsm'. See
+ the Dirmngr manual for details.
+
+'--call-protect-tool ARGUMENTS'
+ Certain maintenance operations are done by an external program call
+ 'gpg-protect-tool'; this is usually not installed in a directory
+ listed in the PATH variable. This command provides a simple
+ wrapper to access this tool. ARGUMENTS are passed verbatim to this
+ command; use '--help' to get a list of supported operations.
+
+
+File: gnupg.info, Node: Certificate Management, Prev: Operational GPGSM Commands, Up: GPGSM Commands
+
+5.1.3 How to manage the certificates and keys
+---------------------------------------------
+
+'--gen-key'
+ This command allows the creation of a certificate signing request
+ or a self-signed certificate. It is commonly used along with the
+ '--output' option to save the created CSR or certificate into a
+ file. If used with the '--batch' a parameter file is used to
+ create the CSR or certificate and it is further possible to create
+ non-self-signed certificates.
+
+'--list-keys'
+'-k'
+ List all available certificates stored in the local key database.
+ Note that the displayed data might be reformatted for better human
+ readability and illegal characters are replaced by safe
+ substitutes.
+
+'--list-secret-keys'
+'-K'
+ List all available certificates for which a corresponding a secret
+ key is available.
+
+'--list-external-keys PATTERN'
+ List certificates matching PATTERN using an external server. This
+ utilizes the 'dirmngr' service.
+
+'--list-chain'
+ Same as '--list-keys' but also prints all keys making up the chain.
+
+'--dump-cert'
+'--dump-keys'
+ List all available certificates stored in the local key database
+ using a format useful mainly for debugging.
+
+'--dump-chain'
+ Same as '--dump-keys' but also prints all keys making up the chain.
+
+'--dump-secret-keys'
+ List all available certificates for which a corresponding a secret
+ key is available using a format useful mainly for debugging.
+
+'--dump-external-keys PATTERN'
+ List certificates matching PATTERN using an external server. This
+ utilizes the 'dirmngr' service. It uses a format useful mainly for
+ debugging.
+
+'--keydb-clear-some-cert-flags'
+ This is a debugging aid to reset certain flags in the key database
+ which are used to cache certain certificate stati. It is
+ especially useful if a bad CRL or a weird running OCSP responder
+ did accidentally revoke certificate. There is no security issue
+ with this command because 'gpgsm' always make sure that the
+ validity of a certificate is checked right before it is used.
+
+'--delete-keys PATTERN'
+ Delete the keys matching PATTERN. Note that there is no command to
+ delete the secret part of the key directly. In case you need to do
+ this, you should run the command 'gpgsm --dump-secret-keys KEYID'
+ before you delete the key, copy the string of hex-digits in the
+ "keygrip" line and delete the file consisting of these hex-digits
+ and the suffix '.key' from the 'private-keys-v1.d' directory below
+ our GnuPG home directory (usually '~/.gnupg').
+
+'--export [PATTERN]'
+ Export all certificates stored in the Keybox or those specified by
+ the optional PATTERN. Those pattern consist of a list of user ids
+ (*note how-to-specify-a-user-id::). When used along with the
+ '--armor' option a few informational lines are prepended before
+ each block. There is one limitation: As there is no commonly
+ agreed upon way to pack more than one certificate into an ASN.1
+ structure, the binary export (i.e. without using 'armor') works
+ only for the export of one certificate. Thus it is required to
+ specify a PATTERN which yields exactly one certificate. Ephemeral
+ certificate are only exported if all PATTERN are given as
+ fingerprints or keygrips.
+
+'--export-secret-key-p12 KEY-ID'
+ Export the private key and the certificate identified by KEY-ID in
+ a PKCS#12 format. When used with the '--armor' option a few
+ informational lines are prepended to the output. Note, that the
+ PKCS#12 format is not very secure and this command is only provided
+ if there is no other way to exchange the private key. (*note
+ option --p12-charset::)
+
+'--export-secret-key-p8 KEY-ID'
+'--export-secret-key-raw KEY-ID'
+ Export the private key of the certificate identified by KEY-ID with
+ any encryption stripped. The '...-raw' command exports in PKCS#1
+ format; the '...-p8' command exports in PKCS#8 format. When used
+ with the '--armor' option a few informational lines are prepended
+ to the output. These commands are useful to prepare a key for use
+ on a TLS server.
+
+'--import [FILES]'
+ Import the certificates from the PEM or binary encoded files as
+ well as from signed-only messages. This command may also be used
+ to import a secret key from a PKCS#12 file.
+
+'--learn-card'
+ Read information about the private keys from the smartcard and
+ import the certificates from there. This command utilizes the
+ 'gpg-agent' and in turn the 'scdaemon'.
+
+'--passwd USER_ID'
+ Change the passphrase of the private key belonging to the
+ certificate specified as USER_ID. Note, that changing the
+ passphrase/PIN of a smartcard is not yet supported.
+
+
+File: gnupg.info, Node: GPGSM Options, Next: GPGSM Configuration, Prev: GPGSM Commands, Up: Invoking GPGSM
+
+5.2 Option Summary
+==================
+
+'GPGSM' features a bunch of options to control the exact behaviour and
+to change the default configuration.
+
+* Menu:
+
+* Configuration Options:: How to change the configuration.
+* Certificate Options:: Certificate related options.
+* Input and Output:: Input and Output.
+* CMS Options:: How to change how the CMS is created.
+* Esoteric Options:: Doing things one usually do not want to do.
+
+
+File: gnupg.info, Node: Configuration Options, Next: Certificate Options, Up: GPGSM Options
+
+5.2.1 How to change the configuration
+-------------------------------------
+
+These options are used to change the configuration and are usually found
+in the option file.
+
+'--options FILE'
+ Reads configuration from FILE instead of from the default per-user
+ configuration file. The default configuration file is named
+ 'gpgsm.conf' and expected in the '.gnupg' directory directly below
+ the home directory of the user.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. You can increase the
+ verbosity by giving several verbose commands to 'gpgsm', such as
+ '-vv'.
+
+'--policy-file FILENAME'
+ Change the default name of the policy file to FILENAME.
+
+'--agent-program FILE'
+ Specify an agent program to be used for secret key operations. The
+ default value is determined by running the command 'gpgconf'. Note
+ that the pipe symbol ('|') is used for a regression test suite hack
+ and may thus not be used in the file name.
+
+'--dirmngr-program FILE'
+ Specify a dirmngr program to be used for CRL checks. The default
+ value is '/usr/local/bin/dirmngr'. 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.
++'--passphrase-fd n'
++ Read the passphrase from file descriptor 'n'. Only the first line
++ will be read from file descriptor 'n'. If you use 0 for 'n', the
++ passphrase will be read from STDIN. This can only be used if only
++ one passphrase is supplied.
++
++ Note that this passphrase is only used if the option '--batch' has
++ also been given.
++
++'--pinentry-mode mode'
++ Set the pinentry mode to 'mode'. Allowed values for 'mode' are:
++ default
++ Use the default of the agent, which is 'ask'.
++ ask
++ Force the use of the Pinentry.
++ cancel
++ Emulate use of Pinentry's cancel button.
++ error
++ Return a Pinentry error ("No Pinentry").
++ loopback
++ Redirect Pinentry queries to the caller. Note that in
++ contrast to Pinentry the user is not prompted again if he
++ enters a bad password.
+
+'--no-common-certs-import'
+ Suppress the import of common certificates on keybox creation.
+
+ All the long options may also be given in the configuration file
+after stripping off the two leading dashes.
+
+
+File: gnupg.info, Node: GPGSM Configuration, Next: GPGSM Examples, Prev: GPGSM Options, Up: Invoking GPGSM
+
+5.3 Configuration files
+=======================
+
+There are a few configuration files to control certain aspects of
+'gpgsm''s operation. Unless noted, they are expected in the current
+home directory (*note option --homedir::).
+
+'gpgsm.conf'
+ This is the standard configuration file read by 'gpgsm' on startup.
+ It may contain any valid long option; the leading two dashes may
+ not be entered and the option may not be abbreviated. This default
+ name may be changed on the command line (*note gpgsm-option
+ --options::). You should backup this file.
+
+'policies.txt'
+ This is a list of allowed CA policies. This file should list the
+ object identifiers of the policies line by line. Empty lines and
+ lines starting with a hash mark are ignored. Policies missing in
+ this file and not marked as critical in the certificate will print
+ only a warning; certificates with policies marked as critical and
+ not listed in this file will fail the signature verification. You
+ should backup this file.
+
+ For example, to allow only the policy 2.289.9.9, the file should
+ look like this:
+
+ # Allowed policies
+ 2.289.9.9
+
+'qualified.txt'
+ This is the list of root certificates used for qualified
+ certificates. They are defined as certificates capable of creating
+ legally binding signatures in the same way as handwritten
+ signatures are. Comments start with a hash mark and empty lines
+ are ignored. Lines do have a length limit but this is not a
+ serious limitation as the format of the entries is fixed and
+ checked by gpgsm: A non-comment line starts with optional
+ whitespace, followed by exactly 40 hex character, white space and a
+ lowercased 2 letter country code. Additional data delimited with
+ by a white space is current ignored but might late be used for
+ other purposes.
+
+ Note that even if a certificate is listed in this file, this does
+ not mean that the certificate is trusted; in general the
+ certificates listed in this file need to be listed also in
+ 'trustlist.txt'.
+
+ This is a global file an installed in the data directory (e.g.
+ '/usr/local/share/gnupg/qualified.txt'). GnuPG installs a suitable
+ file with root certificates as used in Germany. As new Root-CA
+ certificates may be issued over time, these entries may need to be
+ updated; new distributions of this software should come with an
+ updated list but it is still the responsibility of the
+ Administrator to check that this list is correct.
+
+ Everytime 'gpgsm' uses a certificate for signing or verification
+ this file will be consulted to check whether the certificate under
+ question has ultimately been issued by one of these CAs. If this
+ is the case the user will be informed that the verified signature
+ represents a legally binding ("qualified") signature. When
+ creating a signature using such a certificate an extra prompt will
+ be issued to let the user confirm that such a legally binding
+ signature shall really be created.
+
+ Because this software has not yet been approved for use with such
+ certificates, appropriate notices will be shown to indicate this
+ fact.
+
+'help.txt'
+ This is plain text file with a few help entries used with
+ 'pinentry' as well as a large list of help items for 'gpg' and
+ 'gpgsm'. The standard file has English help texts; to install
+ localized versions use filenames like 'help.LL.txt' with LL
+ denoting the locale. GnuPG comes with a set of predefined help
+ files in the data directory (e.g.
+ '/usr/local/share/gnupg/gnupg/help.de.txt') and allows overriding
+ of any help item by help files stored in the system configuration
+ directory (e.g. '/etc/gnupg/help.de.txt'). For a reference of the
+ help file's syntax, please see the installed 'help.txt' file.
+
+'com-certs.pem'
+ This file is a collection of common certificates used to populated
+ a newly created 'pubring.kbx'. An administrator may replace this
+ file with a custom one. The format is a concatenation of PEM
+ encoded X.509 certificates. This global file is installed in the
+ data directory (e.g. '/usr/local/share/gnupg/com-certs.pem').
+
+ Note that on larger installations, it is useful to put predefined
+files into the directory '/etc/skel/.gnupg/' so that newly created users
+start up with a working configuration. For existing users a small
+helper script is provided to create these files (*note addgnupghome::).
+
+ For internal purposes gpgsm creates and maintains a few other files;
+they all live in in the current home directory (*note option
+--homedir::). Only 'gpgsm' may modify these files.
+
+'pubring.kbx'
+ This a database file storing the certificates as well as meta
+ information. For debugging purposes the tool 'kbxutil' may be used
+ to show the internal structure of this file. You should backup
+ this file.
+
+'random_seed'
+ This content of this file is used to maintain the internal state of
+ the random number generator across invocations. The same file is
+ used by other programs of this software too.
+
+'S.gpg-agent'
+ If this file exists 'gpgsm' will first try to connect to this
+ socket for accessing 'gpg-agent' before starting a new 'gpg-agent'
+ instance. Under Windows this socket (which in reality be a plain
+ file describing a regular TCP listening port) is the standard way
+ of connecting the 'gpg-agent'.
+
+
+File: gnupg.info, Node: GPGSM Examples, Next: Unattended Usage, Prev: GPGSM Configuration, Up: Invoking GPGSM
+
+5.4 Examples
+============
+
+ $ gpgsm -er goo at bar.net <plaintext >ciphertext
+
+
+File: gnupg.info, Node: Unattended Usage, Next: GPGSM Protocol, Prev: GPGSM Examples, Up: Invoking GPGSM
+
+5.5 Unattended Usage
+====================
+
+'gpgsm' is often used as a backend engine by other software. To help
+with this a machine interface has been defined to have an unambiguous
+way to do this. This is most likely used with the '--server' command
+but may also be used in the standard operation mode by using the
+'--status-fd' option.
+
+* Menu:
+
+* Automated signature checking:: Automated signature checking.
+* CSR and certificate creation:: CSR and certificate creation.
+
+
+File: gnupg.info, Node: Automated signature checking, Next: CSR and certificate creation, Up: Unattended Usage
+
+5.5.1 Automated signature checking
+----------------------------------
+
+It is very important to understand the semantics used with signature
+verification. Checking a signature is not as simple as it may sound and
+so the operation is a bit complicated. In most cases it is required to
+look at several status lines. Here is a table of all cases a signed
+message may have:
+
+The signature is valid
+ This does mean that the signature has been successfully verified,
+ the certificates are all sane. However there are two subcases with
+ important information: One of the certificates may have expired or
+ a signature of a message itself as expired. It is a sound practise
+ to consider such a signature still as valid but additional
+ information should be displayed. Depending on the subcase 'gpgsm'
+ will issue these status codes:
+ signature valid and nothing did expire
+ 'GOODSIG', 'VALIDSIG', 'TRUST_FULLY'
+ signature valid but at least one certificate has expired
+ 'EXPKEYSIG', 'VALIDSIG', 'TRUST_FULLY'
+ signature valid but expired
+ 'EXPSIG', 'VALIDSIG', 'TRUST_FULLY' Note, that this case is
+ currently not implemented.
+
+The signature is invalid
+ This means that the signature verification failed (this is an
+ indication of af a transfer error, a program error or tampering
+ with the message). 'gpgsm' issues one of these status codes
+ sequences:
+ 'BADSIG'
+ 'GOODSIG, VALIDSIG TRUST_NEVER'
+
+Error verifying a signature
+ For some reason the signature could not be verified, i.e. it
+ cannot be decided whether the signature is valid or invalid. A
+ common reason for this is a missing certificate.
+
+
+File: gnupg.info, Node: CSR and certificate creation, Prev: Automated signature checking, Up: Unattended Usage
+
+5.5.2 CSR and certificate creation
+----------------------------------
+
+The command '--gen-key' may be used along with the option '--batch' to
+either create a certificate signing request (CSR) or an X.509
+certificate. This is controlled by a parameter file; the format of this
+file is as follows:
+
+ * Text only, line length is limited to about 1000 characters.
+ * UTF-8 encoding must be used to specify non-ASCII characters.
+ * Empty lines are ignored.
+ * Leading and trailing while space is ignored.
+ * A hash sign as the first non white space character indicates a
+ comment line.
+ * Control statements are indicated by a leading percent sign, the
+ arguments are separated by white space from the keyword.
+ * Parameters are specified by a keyword, followed by a colon.
+ Arguments are separated by white space.
+ * The first parameter must be 'Key-Type', control statements may be
+ placed anywhere.
+ * The order of the parameters does not matter except for 'Key-Type'
+ which must be the first parameter. The parameters are only used
+ for the generated CSR/certificate; parameters from previous sets
+ are not used. Some syntactically checks may be performed.
+ * Key generation takes place when either the end of the parameter
+ file is reached, the next 'Key-Type' parameter is encountered or at
+ the control statement '%commit' is encountered.
+
+Control statements:
+
+%echo TEXT
+ Print TEXT as diagnostic.
+
+%dry-run
+ Suppress actual key generation (useful for syntax checking).
+
+%commit
+ Perform the key generation. Note that an implicit commit is done
+ at the next Key-Type parameter.
+
+General Parameters:
+
+Key-Type: ALGO
+ Starts a new parameter block by giving the type of the primary key.
+ The algorithm must be capable of signing. This is a required
+ parameter. The only supported value for ALGO is 'rsa'.
+
+Key-Length: NBITS
+ The requested length of a generated key in bits. Defaults to 2048.
+
+Key-Grip: HEXSTRING
+ This is optional and used to generate a CSR or certificatet for an
+ already existing key. Key-Length will be ignored when given.
+
+Key-Usage: USAGE-LIST
+ Space or comma delimited list of key usage, allowed values are
+ 'encrypt', 'sign' and 'cert'. This is used to generate the
+ keyUsage extension. Please make sure that the algorithm is capable
+ of this usage. Default is to allow encrypt and sign.
+
+Name-DN: SUBJECT-NAME
+ This is the Distinguished Name (DN) of the subject in RFC-2253
+ format.
+
+Name-Email: STRING
+ This is an email address for the altSubjectName. This parameter is
+ optional but may occur several times to add several email addresses
+ to a certificate.
+
+Name-DNS: STRING
+ The is an DNS name for the altSubjectName. This parameter is
+ optional but may occur several times to add several DNS names to a
+ certificate.
+
+Name-URI: STRING
+ This is an URI for the altSubjectName. This parameter is optional
+ but may occur several times to add several URIs to a certificate.
+
+Additional parameters used to create a certificate (in contrast to a
+certificate signing request):
+
+Serial: SN
+ If this parameter is given an X.509 certificate will be generated.
+ SN is expected to be a hex string representing an unsigned integer
+ of arbitary length. The special value 'random' can be used to
+ create a 64 bit random serial number.
+
+Issuer-DN: ISSUER-NAME
+ This is the DN name of the issuer in rfc2253 format. If it is not
+ set it will default to the subject DN and a special GnuPG extension
+ will be included in the certificate to mark it as a standalone
+ certificate.
+
+Creation-Date: ISO-DATE
+Not-Before: ISO-DATE
+ Set the notBefore date of the certificate. Either a date like
+ '1986-04-26' or '1986-04-26 12:00' or a standard ISO timestamp like
+ '19860426T042640' may be used. The time is considered to be UTC.
+ If it is not given the current date is used.
+
+Expire-Date: ISO-DATE
+Not-After: ISO-DATE
+ Set the notAfter date of the certificate. Either a date like
+ '2063-04-05' or '2063-04-05 17:00' or a standard ISO timestamp like
+ '20630405T170000' may be used. The time is considered to be UTC.
+ If it is not given a default value in the not too far future is
+ used.
+
+Signing-Key: KEYGRIP
+ This gives the keygrip of the key used to sign the certificate. If
+ it is not given a self-signed certificate will be created. For
+ compatibility with future versions, it is suggested to prefix the
+ keygrip with a '&'.
+
+Hash-Algo: HASH-ALGO
+ Use HASH-ALGO for this CSR or certificate. The supported hash
+ algorithms are: 'sha1', 'sha256', 'sha384' and 'sha512'; they may
+ also be specified with uppercase letters. The default is 'sha256'.
+
+
+File: gnupg.info, Node: GPGSM Protocol, Prev: Unattended Usage, Up: Invoking GPGSM
+
+5.6 The Protocol the Server Mode Uses.
+======================================
+
+Description of the protocol used to access 'GPGSM'. 'GPGSM' does
+implement the Assuan protocol and in addition provides a regular command
+line interface which exhibits a full client to this protocol (but uses
+internal linking). To start 'gpgsm' as a server the command line the
+option '--server' must be used. Additional options are provided to
+select the communication method (i.e. the name of the socket).
+
+ We assume that the connection has already been established; see the
+Assuan manual for details.
+
+* Menu:
+
+* GPGSM ENCRYPT:: Encrypting a message.
+* GPGSM DECRYPT:: Decrypting a message.
+* GPGSM SIGN:: Signing a message.
+* GPGSM VERIFY:: Verifying a message.
+* GPGSM GENKEY:: Generating a key.
+* GPGSM LISTKEYS:: List available keys.
+* GPGSM EXPORT:: Export certificates.
+* GPGSM IMPORT:: Import certificates.
+* GPGSM DELETE:: Delete certificates.
+* GPGSM GETAUDITLOG:: Retrieve an audit log.
+* GPGSM GETINFO:: Information about the process
+* GPGSM OPTION:: Session options.
+
+
+File: gnupg.info, Node: GPGSM ENCRYPT, Next: GPGSM DECRYPT, Up: GPGSM Protocol
+
+5.6.1 Encrypting a Message
+--------------------------
+
+Before encryption can be done the recipient must be set using the
+command:
+
+ RECIPIENT USERID
+
+ Set the recipient for the encryption. USERID should be the internal
+representation of the key; the server may accept any other way of
+specification. If this is a valid and trusted recipient the server does
+respond with OK, otherwise the return is an ERR with the reason why the
+recipient cannot be used, the encryption will then not be done for this
+recipient. If the policy is not to encrypt at all if not all recipients
+are valid, the client has to take care of this. All 'RECIPIENT'
+commands are cumulative until a 'RESET' or an successful 'ENCRYPT'
+command.
+
+ INPUT FD[=N] [--armor|--base64|--binary]
+
+ Set the file descriptor for the message to be encrypted to N.
+Obviously the pipe must be open at that point, the server establishes
+its own end. If the server returns an error the client should consider
+this session failed. If N is not given, this commands uses the last
+file descriptor passed to the application. *Note the assuan_sendfd
+function: (assuan)fun-assuan_sendfd, on how to do descriptor passing.
+
+ The '--armor' option may be used to advice the server that the input
+data is in PEM format, '--base64' advices that a raw base-64 encoding is
+used, '--binary' advices of raw binary input (BER). If none of these
+options is used, the server tries to figure out the used encoding, but
+this may not always be correct.
+
+ OUTPUT FD[=N] [--armor|--base64]
+
+ Set the file descriptor to be used for the output (i.e. the
+encrypted message). Obviously the pipe must be open at that point, the
+server establishes its own end. If the server returns an error he
+client should consider this session failed.
+
+ The option armor encodes the output in PEM format, the '--base64'
+option applies just a base 64 encoding. No option creates binary output
+(BER).
+
+ The actual encryption is done using the command
+
+ ENCRYPT
+
+ It takes the plaintext from the 'INPUT' command, writes to the
+ciphertext to the file descriptor set with the 'OUTPUT' command, take
+the recipients from all the recipients set so far. If this command
+fails the clients should try to delete all output currently done or
+otherwise mark it as invalid. 'GPGSM' does ensure that there will not
+be any security problem with leftover data on the output in this case.
+
+ This command should in general not fail, as all necessary checks have
+been done while setting the recipients. The input and output pipes are
+closed.
+
+
+File: gnupg.info, Node: GPGSM DECRYPT, Next: GPGSM SIGN, Prev: GPGSM ENCRYPT, Up: GPGSM Protocol
+
+5.6.2 Decrypting a message
+--------------------------
+
+Input and output FDs are set the same way as in encryption, but 'INPUT'
+refers to the ciphertext and output to the plaintext. There is no need
+to set recipients. 'GPGSM' automatically strips any S/MIME headers from
+the input, so it is valid to pass an entire MIME part to the INPUT pipe.
+
+ The encryption is done by using the command
+
+ DECRYPT
+
+ It performs the decrypt operation after doing some check on the
+internal state. (e.g. that all needed data has been set). Because it
+utilizes the GPG-Agent for the session key decryption, there is no need
+to ask the client for a protecting passphrase - GpgAgent takes care of
+this by requesting this from the user.
+
+
+File: gnupg.info, Node: GPGSM SIGN, Next: GPGSM VERIFY, Prev: GPGSM DECRYPT, Up: GPGSM Protocol
+
+5.6.3 Signing a Message
+-----------------------
+
+Signing is usually done with these commands:
+
+ INPUT FD[=N] [--armor|--base64|--binary]
+
+ This tells 'GPGSM' to read the data to sign from file descriptor N.
+
+ OUTPUT FD[=M] [--armor|--base64]
+
+ Write the output to file descriptor M. If a detached signature is
+requested, only the signature is written.
+
+ SIGN [--detached]
+
+ Sign the data set with the INPUT command and write it to the sink set
+by OUTPUT. With '--detached', a detached signature is created
+(surprise).
+
+ The key used for signing is the default one or the one specified in
+the configuration file. To get finer control over the keys, it is
+possible to use the command
+
+ SIGNER USERID
+
+ to the signer's key. USERID should be the internal representation of
+the key; the server may accept any other way of specification. If this
+is a valid and trusted recipient the server does respond with OK,
+otherwise the return is an ERR with the reason why the key cannot be
+used, the signature will then not be created using this key. If the
+policy is not to sign at all if not all keys are valid, the client has
+to take care of this. All 'SIGNER' commands are cumulative until a
+'RESET' is done. Note that a 'SIGN' does not reset this list of signers
+which is in contrats to the 'RECIPIENT' command.
+
+
+File: gnupg.info, Node: GPGSM VERIFY, Next: GPGSM GENKEY, Prev: GPGSM SIGN, Up: GPGSM Protocol
+
+5.6.4 Verifying a Message
+-------------------------
+
+To verify a mesage the command:
+
+ VERIFY
+
+ is used. It does a verify operation on the message send to the input
+FD. The result is written out using status lines. If an output FD was
+given, the signed text will be written to that. If the signature is a
+detached one, the server will inquire about the signed material and the
+client must provide it.
+
+
+File: gnupg.info, Node: GPGSM GENKEY, Next: GPGSM LISTKEYS, Prev: GPGSM VERIFY, Up: GPGSM Protocol
+
+5.6.5 Generating a Key
+----------------------
+
+This is used to generate a new keypair, store the secret part in the PSE
+and the public key in the key database. We will probably add optional
+commands to allow the client to select whether a hardware token is used
+to store the key. Configuration options to 'GPGSM' can be used to
+restrict the use of this command.
+
+ GENKEY
+
+ 'GPGSM' checks whether this command is allowed and then does an
+INQUIRY to get the key parameters, the client should then send the key
+parameters in the native format:
+
+ S: INQUIRE KEY_PARAM native
+ C: D foo:fgfgfg
+ C: D bar
+ C: END
+
+ Please note that the server may send Status info lines while reading
+the data lines from the client. After this the key generation takes
+place and the server eventually does send an ERR or OK response. Status
+lines may be issued as a progress indicator.
+
+
+File: gnupg.info, Node: GPGSM LISTKEYS, Next: GPGSM EXPORT, Prev: GPGSM GENKEY, Up: GPGSM Protocol
+
+5.6.6 List available keys
+-------------------------
+
+To list the keys in the internal database or using an external key
+provider, the command:
+
+ LISTKEYS PATTERN
+
+ is used. To allow multiple patterns (which are ORed during the
+search) quoting is required: Spaces are to be translated into "+" or
+into "%20"; in turn this requires that the usual escape quoting rules
+are done.
+
+ LISTSECRETKEYS PATTERN
+
+ Lists only the keys where a secret key is available.
+
+ The list commands commands are affected by the option
+
+ OPTION list-mode=MODE
+
+ where mode may be:
+'0'
+ Use default (which is usually the same as 1).
+'1'
+ List only the internal keys.
+'2'
+ List only the external keys.
+'3'
+ List internal and external keys.
+
+ Note that options are valid for the entire session.
+
+
+File: gnupg.info, Node: GPGSM EXPORT, Next: GPGSM IMPORT, Prev: GPGSM LISTKEYS, Up: GPGSM Protocol
+
+5.6.7 Export certificates
+-------------------------
+
+To export certificate from the internal key database the command:
+
+ EXPORT [--data [--armor] [--base64]] [--] PATTERN
+
+ is used. To allow multiple patterns (which are ORed) quoting is
+required: Spaces are to be translated into "+" or into "%20"; in turn
+this requires that the usual escape quoting rules are done.
+
+ If the '--data' option has not been given, the format of the output
+depends on what was set with the OUTPUT command. When using PEM
+encoding a few informational lines are prepended.
+
+ If the '--data' has been given, a target set via OUTPUT is ignored
+and the data is returned inline using standard 'D'-lines. This avoids
+the need for an extra file descriptor. In this case the options
+'--armor' and '--base64' may be used in the same way as with the OUTPUT
+command.
+
+
+File: gnupg.info, Node: GPGSM IMPORT, Next: GPGSM DELETE, Prev: GPGSM EXPORT, Up: GPGSM Protocol
+
+5.6.8 Import certificates
+-------------------------
+
+To import certificates into the internal key database, the command
+
+ IMPORT [--re-import]
+
+ is used. The data is expected on the file descriptor set with the
+'INPUT' command. Certain checks are performed on the certificate. Note
+that the code will also handle PKCS#12 files and import private keys; a
+helper program is used for that.
+
+ With the option '--re-import' the input data is expected to a be a
+linefeed separated list of fingerprints. The command will re-import the
+corresponding certificates; that is they are made permanent by removing
+their ephemeral flag.
+
+
+File: gnupg.info, Node: GPGSM DELETE, Next: GPGSM GETAUDITLOG, Prev: GPGSM IMPORT, Up: GPGSM Protocol
+
+5.6.9 Delete certificates
+-------------------------
+
+To delete a certificate the command
+
+ DELKEYS PATTERN
+
+ is used. To allow multiple patterns (which are ORed) quoting is
+required: Spaces are to be translated into "+" or into "%20"; in turn
+this requires that the usual escape quoting rules are done.
+
+ The certificates must be specified unambiguously otherwise an error
+is returned.
+
+
+File: gnupg.info, Node: GPGSM GETAUDITLOG, Next: GPGSM GETINFO, Prev: GPGSM DELETE, Up: GPGSM Protocol
+
+5.6.10 Retrieve an audit log.
+-----------------------------
+
+This command is used to retrieve an audit log.
+
+ GETAUDITLOG [--data] [--html]
+
+ If '--data' is used, the audit log is send using D-lines instead of
+being sent to the file descriptor given by an OUTPUT command. If
+'--html' is used, the output is formated as an XHTML block. This is
+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.
+
+
+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.
++'gpgv' is an OpenPGP signature verification tool.
+
+ This program is actually a stripped-down version of 'gpg' which is
+only able to check signatures. It is somewhat smaller than the
+fully-blown 'gpg' and uses a different (and simpler) way to check that
+the public keys used to make the signature are valid. There are no
+configuration files and only a few options are implemented.
+
- 'gpgv2' assumes that all keys in the keyring are trustworthy. That
++ 'gpgv' assumes that all keys in the keyring are trustworthy. That
+does also mean that it does not check for expired or revoked keys.
+
+ By default a keyring named 'trustedkeys.kbx' is used; if that does
+not exist a keyring named 'trustedkeys.gpg' is used. The default
+keyring is assumed to be in the home directory of GnuPG, either the
+default home directory or the one set by an option or an environment
+variable. The option '--keyring' may be used to specify a different
+keyring or even multiple keyrings.
+
- 'gpgv2' recognizes these options:
++ 'gpgv' recognizes these options:
+
+'--verbose'
+'-v'
+ Gives more information during processing. If used twice, the input
+ data is listed in detail.
+
+'--quiet'
+'-q'
+ Try to be as quiet as possible.
+
+'--keyring FILE'
+ Add FILE to the list of keyrings. If FILE begins with a tilde and
+ a slash, these are replaced by the HOME directory. If the filename
+ does not contain a slash, it is assumed to be in the home-directory
+ ("~/.gnupg" if -homedir is not used).
+
+'--status-fd N'
+ Write special status strings to the file descriptor N. See the
+ file DETAILS in the documentation for a listing of them.
+
+'--logger-fd n'
+ Write log output to file descriptor 'n' and not to stderr.
+
+'--ignore-time-conflict'
+ GnuPG normally checks that the timestamps associated with keys and
+ signatures have plausible values. However, sometimes a signature
+ seems to be older than the key due to clock problems. This option
+ turns these checks into warnings.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'--weak-digest name'
+ Treat the specified digest algorithm as weak. Signatures made over
+ weak digests algorithms are normally rejected. This option can be
+ supplied multiple times if multiple algorithms should be considered
+ weak. MD5 is always considered weak, and does not need to be
+ listed explicitly.
+
+ The program returns 0 if everything is fine, 1 if at least one
+signature was bad, and other error codes for fatal errors.
+
+8.2.1 Examples
+--------------
+
- gpgv2 'pgpfile'
- gpgv2 'sigfile' ['datafile']
++gpgv 'pgpfile'
++gpgv 'sigfile' ['datafile']
+ Verify the signature of the file. The second form is used for
+ detached signatures, where 'sigfile' is the detached signature
+ (either ASCII-armored or binary) and 'datafile' contains the signed
+ data; if 'datafile' is "-" the signed data is expected on 'stdin';
+ if 'datafile' is not given the name of the file holding the signed
+ data is constructed by cutting off the extension (".asc", ".sig" or
+ ".sign") from 'sigfile'.
+
+8.2.2 Environment
+-----------------
+
+HOME
+ Used to locate the default home directory.
+
+GNUPGHOME
+ If set directory used instead of "~/.gnupg".
+
+8.2.3 FILES
+-----------
+
+~/.gnupg/trustedkeys.gpg
+ The default keyring with the allowed keys.
+
+ 'gpg2'(1)
+
diff --cc doc/gnupg.info-2
index 48da908,0000000..0eec568
mode 100644,000000..100644
--- a/doc/gnupg.info-2
+++ b/doc/gnupg.info-2
@@@ -1,3882 -1,0 +1,3895 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.11, January
- 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.12, May 2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+INFO-DIR-SECTION GNU Utilities
+START-INFO-DIR-ENTRY
+* gpg2: (gnupg). OpenPGP encryption and signing tool.
+* gpgsm: (gnupg). S/MIME encryption and signing tool.
+* gpg-agent: (gnupg). The secret key daemon.
+* dirmngr: (gnupg). X.509 CRL and OCSP server.
+* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
+END-INFO-DIR-ENTRY
+
+
+File: gnupg.info, Node: 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 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
+
+8.11 Encrypt or sign files into an archive
+==========================================
+
+'gpg-zip' encrypts or signs files into an archive. It is an gpg-ized
+tar using the same format as used by PGP's PGP Zip.
+
+'gpg-zip' is invoked this way:
+
+ gpg-zip [options] FILENAME1 [FILENAME2, ...] DIRECTORY [DIRECTORY2, ...]
+
+'gpg-zip' understands these options:
+
+'--encrypt'
+'-e'
+ Encrypt data. This option may be combined with '--symmetric' (for
+ output that may be decrypted via a secret key or a passphrase).
+
+'--decrypt'
+'-d'
+ Decrypt data.
+
+'--symmetric'
+'-c'
+ Encrypt with a symmetric cipher using a passphrase. The default
+ symmetric cipher used is CAST5, but may be chosen with the
+ '--cipher-algo' option to 'gpg'.
+
+'--sign'
+'-s'
+ Make a signature. See 'gpg'.
+
+'--recipient USER'
+'-r USER'
+ Encrypt for user id USER. See 'gpg'.
+
+'--local-user USER'
+'-u USER'
+ Use USER as the key to sign with. See 'gpg'.
+
+'--list-archive'
+ List the contents of the specified archive.
+
+'--output FILE'
+'-o FILE'
+ Write output to specified file FILE.
+
+'--gpg GPGCMD'
+ Use the specified command GPGCMD instead of 'gpg'.
+
+'--gpg-args ARGS'
+ Pass the specified options to 'gpg'.
+
+'--tar TARCMD'
+ Use the specified command TARCMD instead of 'tar'.
+
+'--tar-args ARGS'
+ Pass the specified options to 'tar'.
+
+'--version'
+ Print version of the program and exit.
+
+'--help'
+ Display a brief help page and exit.
+
+The program returns 0 if everything was fine, 1 otherwise.
+
+Some examples:
+
+Encrypt the contents of directory 'mydocs' for user Bob to file 'test1':
+
+ gpg-zip --encrypt --output test1 --gpg-args -r Bob mydocs
+
+List the contents of archive 'test1':
+
+ gpg-zip --list-archive test1
+
+
+File: gnupg.info, Node: Howtos, Next: System Notes, Prev: Helper Tools, Up: Top
+
+9 How to do certain things
+**************************
+
+This is a collection of small howto documents.
+
+* Menu:
+
+* Howto Create a Server Cert:: Creating a TLS server certificate.
+
+
+File: gnupg.info, Node: Howto Create a Server Cert, Up: Howtos
+
+9.1 Creating a TLS server certificate
+=====================================
+
+Here is a brief run up on how to create a server certificate. It has
+actually been done this way to get a certificate from CAcert to be used
+on a real server. It has only been tested with this CA, but there
+shouldn't be any problem to run this against any other CA.
+
+ We start by generating an X.509 certificate signing request. As
+there is no need for a configuration file, you may simply enter:
+
+ $ gpgsm --gen-key >example.com.cert-req.pem
+ Please select what kind of key you want:
+ (1) RSA
+ (2) Existing key
+ (3) Existing key from card
+ Your selection? 1
+
+ I opted for creating a new RSA key. The other option is to use an
+already existing key, by selecting '2' and entering the so-called
+keygrip. Running the command 'gpgsm --dump-secret-key USERID' shows you
+this keygrip. Using '3' offers another menu to create a certificate
+directly from a smart card based key.
+
+ Let's continue:
+
+ What keysize do you want? (2048)
+ Requested keysize is 2048 bits
+
+ Hitting enter chooses the default RSA key size of 2048 bits. Smaller
+keys are too weak on the modern Internet. If you choose a larger
+(stronger) key, your server will need to do more work.
+
+ Possible actions for a RSA key:
+ (1) sign, encrypt
+ (2) sign
+ (3) encrypt
+ Your selection? 1
+
+ Selecting "sign" enables use of the key for Diffie-Hellman key
+exchange mechanisms (DHE and ECDHE) in TLS, which are preferred because
+they offer forward secrecy. Selecting "encrypt" enables RSA key
+exchange mechanisms, which are still common in some places. Selecting
+both enables both key exchange mechanisms.
+
+ Now for some real data:
+
+ Enter the X.509 subject name: CN=example.com
+
+ This is the most important value for a server certificate. Enter
+here the canonical name of your server machine. You may add other
+virtual server names later.
+
+ E-Mail addresses (end with an empty line):
+ >
+
+ We don't need email addresses in a TLS server certificate and CAcert
+would anyway ignore such a request. Thus just hit enter.
+
+ If you want to create a client certificate for email encryption, this
+would be the place to enter your mail address (e.g. <joe at example.org>).
+You may enter as many addresses as you like, however the CA may not
+accept them all or reject the entire request.
+
+ Enter DNS names (optional; end with an empty line):
+ > example.com
+ > www.example.com
+ >
+
+ Here I entered the names of the services which the machine actually
+provides. You almost always want to include the canonical name here
+too. The browser will accept a certificate for any of these names. As
+usual the CA must approve all of these names.
+
+ URIs (optional; end with an empty line):
+ >
+
+ It is possible to insert arbitrary URIs into a certificate; for a
+server certificate this does not make sense.
+
+ Create self-signed certificate? (y/N)
+
+ Since we are creating a certificate signing request, and not a full
+certificate, we answer no here, or just hit enter for the default.
+
+ We have now entered all required information and 'gpgsm' will display
+what it has gathered and ask whether to create the certificate request:
+
+ These parameters are used:
+ Key-Type: RSA
+ Key-Length: 2048
+ Key-Usage: sign, encrypt
+ Name-DN: CN=example.com
+ Name-DNS: example.com
+ Name-DNS: www.example.com
+
+ Proceed with creation? (y/N) y
+
+ 'gpgsm' will now start working on creating the request. As this
+includes the creation of an RSA key it may take a while. During this
+time you will be asked 3 times for a passphrase to protect the created
+private key on your system. A pop up window will appear to ask for it.
+The first two prompts are for the new passphrase and for re-entering it;
+the third one is required to actually create the certificate signing
+request.
+
+ When it is ready, you should see the final notice:
+
+ gpgsm: certificate request created
+ Ready. You should now send this request to your CA.
+
+ Now, you may look at the created request:
+
+ $ cat example.com.cert-req.pem
+ -----BEGIN CERTIFICATE REQUEST-----
+ MIIClTCCAX0CAQAwFjEUMBIGA1UEAxMLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDP1QEcbTvOLLCX4gAoOzH9AW7jNOMj7OSOL0uW
+ h2bCdkK5YVpnX212Z6COTC3ZG0pJiCeGt1TbbDJUlTa4syQ6JXavjK66N8ASZsyC
+ Rwcl0m6hbXp541t1dbgt2VgeGk25okWw3j+brw6zxLD2TnthJxOatID0lDIG47HW
+ GqzZmA6WHbIBIONmGnReIHTpPAPCDm92vUkpKG1xLPszuRmsQbwEl870W/FHrsvm
+ DPvVUUSdIvTV9NuRt7/WY6G4nPp9QlIuTf1ESPzIuIE91gKPdrRCAx0yuT708S1n
+ xCv3ETQ/bKPoAQ67eE3mPBqkcVwv9SE/2/36Lz06kAizRgs5AgMBAAGgOjA4Bgkq
+ hkiG9w0BCQ4xKzApMCcGA1UdEQQgMB6CC2V4YW1wbGUuY29tgg93d3cuZXhhbXBs
+ ZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEWD0Qqz4OENLYp6yyO/KqF0ig9FDsLN
+ b5/R+qhms5qlhdB5+Dh+j693Sj0UgbcNKc6JT86IuBqEBZmRCJuXRoKoo5aMS1cJ
+ hXga7N9IA3qb4VBUzBWvlL92U2Iptr/cEbikFlYZF2Zv3PBv8RfopVlI3OLbKV9D
+ bJJTt/6kuoydXKo/Vx4G0DFzIKNdFdJk86o/Ziz8NOs9JjZxw9H9VY5sHKFM5LKk
+ VcLwnnLRlNjBGB+9VK/Tze575eG0cJomTp7UGIB+1xzIQVAhUZOizRDv9tHDeaK3
+ k+tUhV0kuJcYHucpJycDSrP/uAY5zuVJ0rs2QSjdnav62YrRgEsxJrU=
+ -----END CERTIFICATE REQUEST-----
+ $
+
+ You may now proceed by logging into your account at the CAcert
+website, choose 'Server Certificates - New', check 'sign by class 3 root
+certificate', paste the above request block into the text field and
+click on 'Submit'.
+
+ If everything works out fine, a certificate will be shown. Now run
+
+ $ gpgsm --import
+
+ and paste the certificate from the CAcert page into your terminal
+followed by a Ctrl-D
+
+ -----BEGIN CERTIFICATE-----
+ MIIEIjCCAgqgAwIBAgIBTDANBgkqhkiG9w0BAQQFADBUMRQwEgYDVQQKEwtDQWNl
+ [...]
+ rUTFlNElRXCwIl0YcJkIaYYqWf7+A/aqYJCi8+51usZwMy3Jsq3hJ6MA3h1BgwZs
+ Rtct3tIX
+ -----END CERTIFICATE-----
+ gpgsm: issuer certificate (#/CN=CAcert Class 3 Ro[...]) not found
+ gpgsm: certificate imported
+
+ gpgsm: total number processed: 1
+ gpgsm: imported: 1
+
+ gpgsm tells you that it has imported the certificate. It is now
+associated with the key you used when creating the request. The root
+certificate has not been found, so you may want to import it from the
+CACert website.
+
+ To see the content of your certificate, you may now enter:
+
+ $ gpgsm -K example.com
+ /home/foo/.gnupg/pubring.kbx
+ ---------------------------
+ Serial number: 4C
+ Issuer: /CN=CAcert Class 3 Root/OU=http:\x2f\x2fwww.[...]
+ Subject: /CN=example.com
+ aka: (dns-name example.com)
+ aka: (dns-name www.example.com)
+ validity: 2015-07-01 16:20:51 through 2016-07-01 16:20:51
+ key type: 2048 bit RSA
+ key usage: digitalSignature keyEncipherment
+ ext key usage: clientAuth (suggested), serverAuth (suggested), [...]
+ fingerprint: 0F:9C:27:B2:DA:05:5F:CB:33:D8:19:E9:65:B9:4F:BD:B1:98:CC:57
+
+ I used '-K' above because this will only list certificates for which
+a private key is available. To see more details, you may use
+'--dump-secret-keys' instead of '-K'.
+
+ To make actual use of the certificate you need to install it on your
+server. Server software usually expects a PKCS\#12 file with key and
+certificate. To create such a file, run:
+
+ $ gpgsm --export-secret-key-p12 -a >example.com-cert.pem
+
+ You will be asked for the passphrase as well as for a new passphrase
+to be used to protect the PKCS\#12 file. The file now contains the
+certificate as well as the private key:
+
+ $ cat example-cert.pem
+ Issuer ...: /CN=CAcert Class 3 Root/OU=http:\x2f\x2fwww.CA[...]
+ Serial ...: 4C
+ Subject ..: /CN=example.com
+ aka ..: (dns-name example.com)
+ aka ..: (dns-name www.example.com)
+
+ -----BEGIN PKCS12-----
+ MIIHlwIBAzCCB5AGCSqGSIb37QdHAaCCB4EEggd9MIIHeTk1BJ8GCSqGSIb3DQEu
+ [...many more lines...]
+ -----END PKCS12-----
+ $
+
+ Copy this file in a secure way to the server, install it there and
+delete the file then. You may export the file again at any time as long
+as it is available in GnuPG's private key database.
+
+
+File: gnupg.info, Node: System Notes, Next: Debugging, Prev: Howtos, Up: Top
+
+10 Notes pertaining to certain OSes.
+************************************
+
+GnuPG has been developed on GNU/Linux systems and is know to work on
+almost all Free OSes. All modern POSIX systems should be supported
+right now, however there are probably a lot of smaller glitches we need
+to fix first. The major problem areas are:
+
+ * 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.
++* Component interaction:: How the components work together.
++* GnuPG-1 and GnuPG-2:: Relationship between GnuPG 1.4 and 2.x.
+
+
- File: gnupg.info, Node: GnuPG-1 and GnuPG-2, Up: Architecture Details
++File: gnupg.info, Node: Component interaction, Next: GnuPG-1 and GnuPG-2, Up: Architecture Details
+
- 11.4.1 Relationship between the two branches.
- ---------------------------------------------
++11.4.1 How the components work together.
++----------------------------------------
++
++
++
++Figure 11.1: GnuPG module overview
++
++
++File: gnupg.info, Node: GnuPG-1 and GnuPG-2, Prev: Component interaction, Up: Architecture Details
+
- Here is a little picture showing how the components work together:
++11.4.2 Relationship between GnuPG 1.4 and 2.x.
++----------------------------------------------
+
-
++Here is a little picture showing how the different GnuPG versions make
++use of a smartcard:
+
- Lets try to explain it:
++
+
- TO BE DONE.
++Figure 11.2: GnuPG card architecture
+
+
+File: gnupg.info, Node: Copying, Next: Contributors, Prev: Debugging, Up: Top
+
+GNU General Public License
+**************************
+
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+ Everyone is permitted to copy and distribute verbatim copies of this
+ license document, but changing it is not allowed.
+
+Preamble
+========
+
+The GNU General Public License is a free, copyleft license for software
+and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program-to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public
+ License.
+
+ "Copyright" also means copyright-like laws that apply to other
+ kinds of works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+ License. Each licensee is addressed as "you". "Licensees" and
+ "recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the
+ work in a fashion requiring copyright permission, other than the
+ making of an exact copy. The resulting work is called a "modified
+ version" of the earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work
+ based on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+ permission, would make you directly or secondarily liable for
+ infringement under applicable copyright law, except executing it on
+ a computer or modifying a private copy. Propagation includes
+ copying, distribution (with or without modification), making
+ available to the public, and in some countries other activities as
+ well.
+
+ To "convey" a work means any kind of propagation that enables other
+ parties to make or receive copies. Mere interaction with a user
+ through a computer network, with no transfer of a copy, is not
+ conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+ to the extent that it includes a convenient and prominently visible
+ feature that (1) displays an appropriate copyright notice, and (2)
+ tells the user that there is no warranty for the work (except to
+ the extent that warranties are provided), that licensees may convey
+ the work under this License, and how to view a copy of this
+ License. If the interface presents a list of user commands or
+ options, such as a menu, a prominent item in the list meets this
+ criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+ for making modifications to it. "Object code" means any non-source
+ form of a work.
+
+ A "Standard Interface" means an interface that either is an
+ official standard defined by a recognized standards body, or, in
+ the case of interfaces specified for a particular programming
+ language, one that is widely used among developers working in that
+ language.
+
+ The "System Libraries" of an executable work include anything,
+ other than the work as a whole, that (a) is included in the normal
+ form of packaging a Major Component, but which is not part of that
+ Major Component, and (b) serves only to enable use of the work with
+ that Major Component, or to implement a Standard Interface for
+ which an implementation is available to the public in source code
+ form. A "Major Component", in this context, means a major
+ essential component (kernel, window system, and so on) of the
+ specific operating system (if any) on which the executable work
+ runs, or a compiler used to produce the work, or an object code
+ interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+ the source code needed to generate, install, and (for an executable
+ work) run the object code and to modify the work, including scripts
+ to control those activities. However, it does not include the
+ work's System Libraries, or general-purpose tools or generally
+ available free programs which are used unmodified in performing
+ those activities but which are not part of the work. For example,
+ Corresponding Source includes interface definition files associated
+ with source files for the work, and the source code for shared
+ libraries and dynamically linked subprograms that the work is
+ specifically designed to require, such as by intimate data
+ communication or control flow between those subprograms and other
+ parts of the work.
+
+ The Corresponding Source need not include anything that users can
+ regenerate automatically from other parts of the Corresponding
+ Source.
+
+ The Corresponding Source for a work in source code form is that
+ same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+ copyright on the Program, and are irrevocable provided the stated
+ conditions are met. This License explicitly affirms your unlimited
+ permission to run the unmodified Program. The output from running
+ a covered work is covered by this License only if the output, given
+ its content, constitutes a covered work. This License acknowledges
+ your rights of fair use or other equivalent, as provided by
+ copyright law.
+
+ You may make, run and propagate covered works that you do not
+ convey, without conditions so long as your license otherwise
+ remains in force. You may convey covered works to others for the
+ sole purpose of having them make modifications exclusively for you,
+ or provide you with facilities for running those works, provided
+ that you comply with the terms of this License in conveying all
+ material for which you do not control copyright. Those thus making
+ or running the covered works for you must do so exclusively on your
+ behalf, under your direction and control, on terms that prohibit
+ them from making any copies of your copyrighted material outside
+ their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+ the conditions stated below. Sublicensing is not allowed; section
+ 10 makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+ measure under any applicable law fulfilling obligations under
+ article 11 of the WIPO copyright treaty adopted on 20 December
+ 1996, or similar laws prohibiting or restricting circumvention of
+ such measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+ circumvention of technological measures to the extent such
+ circumvention is effected by exercising rights under this License
+ with respect to the covered work, and you disclaim any intention to
+ limit operation or modification of the work as a means of
+ enforcing, against the work's users, your or third parties' legal
+ rights to forbid circumvention of technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+ receive it, in any medium, provided that you conspicuously and
+ appropriately publish on each copy an appropriate copyright notice;
+ keep intact all notices stating that this License and any
+ non-permissive terms added in accord with section 7 apply to the
+ code; keep intact all notices of the absence of any warranty; and
+ give all recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+ and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+ produce it from the Program, in the form of source code under the
+ terms of section 4, provided that you also meet all of these
+ conditions:
+
+ a. The work must carry prominent notices stating that you
+ modified it, and giving a relevant date.
+
+ b. The work must carry prominent notices stating that it is
+ released under this License and any conditions added under
+ section 7. This requirement modifies the requirement in
+ section 4 to "keep intact all notices".
+
+ c. You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable
+ section 7 additional terms, to the whole of the work, and all
+ its parts, regardless of how they are packaged. This License
+ gives no permission to license the work in any other way, but
+ it does not invalidate such permission if you have separately
+ received it.
+
+ d. If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has
+ interactive interfaces that do not display Appropriate Legal
+ Notices, your work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+ works, which are not by their nature extensions of the covered
+ work, and which are not combined with it such as to form a larger
+ program, in or on a volume of a storage or distribution medium, is
+ called an "aggregate" if the compilation and its resulting
+ copyright are not used to limit the access or legal rights of the
+ compilation's users beyond what the individual works permit.
+ Inclusion of a covered work in an aggregate does not cause this
+ License to apply to the other parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+ of sections 4 and 5, provided that you also convey the
+ machine-readable Corresponding Source under the terms of this
+ License, in one of these ways:
+
+ a. Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b. Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that
+ product model, to give anyone who possesses the object code
+ either (1) a copy of the Corresponding Source for all the
+ software in the product that is covered by this License, on a
+ durable physical medium customarily used for software
+ interchange, for a price no more than your reasonable cost of
+ physically performing this conveying of source, or (2) access
+ to copy the Corresponding Source from a network server at no
+ charge.
+
+ c. Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially,
+ and only if you received the object code with such an offer,
+ in accord with subsection 6b.
+
+ d. Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to
+ the Corresponding Source in the same way through the same
+ place at no further charge. You need not require recipients
+ to copy the Corresponding Source along with the object code.
+ If the place to copy the object code is a network server, the
+ Corresponding Source may be on a different server (operated by
+ you or a third party) that supports equivalent copying
+ facilities, provided you maintain clear directions next to the
+ object code saying where to find the Corresponding Source.
+ Regardless of what server hosts the Corresponding Source, you
+ remain obligated to ensure that it is available for as long as
+ needed to satisfy these requirements.
+
+ e. Convey the object code using peer-to-peer transmission,
+ provided you inform other peers where the object code and
+ Corresponding Source of the work are being offered to the
+ general public at no charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is
+ excluded from the Corresponding Source as a System Library, need
+ not be included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means
+ any tangible personal property which is normally used for personal,
+ family, or household purposes, or (2) anything designed or sold for
+ incorporation into a dwelling. In determining whether a product is
+ a consumer product, doubtful cases shall be resolved in favor of
+ coverage. For a particular product received by a particular user,
+ "normally used" refers to a typical or common use of that class of
+ product, regardless of the status of the particular user or of the
+ way in which the particular user actually uses, or expects or is
+ expected to use, the product. A product is a consumer product
+ regardless of whether the product has substantial commercial,
+ industrial or non-consumer uses, unless such uses represent the
+ only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+ procedures, authorization keys, or other information required to
+ install and execute modified versions of a covered work in that
+ User Product from a modified version of its Corresponding Source.
+ The information must suffice to ensure that the continued
+ functioning of the modified object code is in no case prevented or
+ interfered with solely because modification has been made.
+
+ If you convey an object code work under this section in, or with,
+ or specifically for use in, a User Product, and the conveying
+ occurs as part of a transaction in which the right of possession
+ and use of the User Product is transferred to the recipient in
+ perpetuity or for a fixed term (regardless of how the transaction
+ is characterized), the Corresponding Source conveyed under this
+ section must be accompanied by the Installation Information. But
+ this requirement does not apply if neither you nor any third party
+ retains the ability to install modified object code on the User
+ Product (for example, the work has been installed in ROM).
+
+ The requirement to provide Installation Information does not
+ include a requirement to continue to provide support service,
+ warranty, or updates for a work that has been modified or installed
+ by the recipient, or for the User Product in which it has been
+ modified or installed. Access to a network may be denied when the
+ modification itself materially and adversely affects the operation
+ of the network or violates the rules and protocols for
+ communication across the network.
+
+ Corresponding Source conveyed, and Installation Information
+ provided, in accord with this section must be in a format that is
+ publicly documented (and with an implementation available to the
+ public in source code form), and must require no special password
+ or key for unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of
+ this License by making exceptions from one or more of its
+ conditions. Additional permissions that are applicable to the
+ entire Program shall be treated as though they were included in
+ this License, to the extent that they are valid under applicable
+ law. If additional permissions apply only to part of the Program,
+ that part may be used separately under those permissions, but the
+ entire Program remains governed by this License without regard to
+ the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+ remove any additional permissions from that copy, or from any part
+ of it. (Additional permissions may be written to require their own
+ removal in certain cases when you modify the work.) You may place
+ additional permissions on material, added by you to a covered work,
+ for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material
+ you add to a covered work, you may (if authorized by the copyright
+ holders of that material) supplement the terms of this License with
+ terms:
+
+ a. Disclaiming warranty or limiting liability differently from
+ the terms of sections 15 and 16 of this License; or
+
+ b. Requiring preservation of specified reasonable legal notices
+ or author attributions in that material or in the Appropriate
+ Legal Notices displayed by works containing it; or
+
+ c. Prohibiting misrepresentation of the origin of that material,
+ or requiring that modified versions of such material be marked
+ in reasonable ways as different from the original version; or
+
+ d. Limiting the use for publicity purposes of names of licensors
+ or authors of the material; or
+
+ e. Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f. Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified
+ versions of it) with contractual assumptions of liability to
+ the recipient, for any liability that these contractual
+ assumptions directly impose on those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+ restrictions" within the meaning of section 10. If the Program as
+ you received it, or any part of it, contains a notice stating that
+ it is governed by this License along with a term that is a further
+ restriction, you may remove that term. If a license document
+ contains a further restriction but permits relicensing or conveying
+ under this License, you may add to a covered work material governed
+ by the terms of that license document, provided that the further
+ restriction does not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+ must place, in the relevant source files, a statement of the
+ additional terms that apply to those files, or a notice indicating
+ where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in
+ the form of a separately written license, or stated as exceptions;
+ the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+ provided under this License. Any attempt otherwise to propagate or
+ modify it is void, and will automatically terminate your rights
+ under this License (including any patent licenses granted under the
+ third paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+ license from a particular copyright holder is reinstated (a)
+ provisionally, unless and until the copyright holder explicitly and
+ finally terminates your license, and (b) permanently, if the
+ copyright holder fails to notify you of the violation by some
+ reasonable means prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+ reinstated permanently if the copyright holder notifies you of the
+ violation by some reasonable means, this is the first time you have
+ received notice of violation of this License (for any work) from
+ that copyright holder, and you cure the violation prior to 30 days
+ after your receipt of the notice.
+
+ Termination of your rights under this section does not terminate
+ the licenses of parties who have received copies or rights from you
+ under this License. If your rights have been terminated and not
+ permanently reinstated, you do not qualify to receive new licenses
+ for the same material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+ run a copy of the Program. Ancillary propagation of a covered work
+ occurring solely as a consequence of using peer-to-peer
+ transmission to receive a copy likewise does not require
+ acceptance. However, nothing other than this License grants you
+ permission to propagate or modify any covered work. These actions
+ infringe copyright if you do not accept this License. Therefore,
+ by modifying or propagating a covered work, you indicate your
+ acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+ receives a license from the original licensors, to run, modify and
+ propagate that work, subject to this License. You are not
+ responsible for enforcing compliance by third parties with this
+ License.
+
+ An "entity transaction" is a transaction transferring control of an
+ organization, or substantially all assets of one, or subdividing an
+ organization, or merging organizations. If propagation of a
+ covered work results from an entity transaction, each party to that
+ transaction who receives a copy of the work also receives whatever
+ licenses to the work the party's predecessor in interest had or
+ could give under the previous paragraph, plus a right to possession
+ of the Corresponding Source of the work from the predecessor in
+ interest, if the predecessor has it or can get it with reasonable
+ efforts.
+
+ You may not impose any further restrictions on the exercise of the
+ rights granted or affirmed under this License. For example, you
+ may not impose a license fee, royalty, or other charge for exercise
+ of rights granted under this License, and you may not initiate
+ litigation (including a cross-claim or counterclaim in a lawsuit)
+ alleging that any patent claim is infringed by making, using,
+ selling, offering for sale, or importing the Program or any portion
+ of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+ License of the Program or a work on which the Program is based.
+ The work thus licensed is called the contributor's "contributor
+ version".
+
+ A contributor's "essential patent claims" are all patent claims
+ owned or controlled by the contributor, whether already acquired or
+ hereafter acquired, that would be infringed by some manner,
+ permitted by this License, of making, using, or selling its
+ contributor version, but do not include claims that would be
+ infringed only as a consequence of further modification of the
+ contributor version. For purposes of this definition, "control"
+ includes the right to grant patent sublicenses in a manner
+ consistent with the requirements of this License.
+
+ Each contributor grants you a non-exclusive, worldwide,
+ royalty-free patent license under the contributor's essential
+ patent claims, to make, use, sell, offer for sale, import and
+ otherwise run, modify and propagate the contents of its contributor
+ version.
+
+ In the following three paragraphs, a "patent license" is any
+ express agreement or commitment, however denominated, not to
+ enforce a patent (such as an express permission to practice a
+ patent or covenant not to sue for patent infringement). To "grant"
+ such a patent license to a party means to make such an agreement or
+ commitment not to enforce a patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent
+ license, and the Corresponding Source of the work is not available
+ for anyone to copy, free of charge and under the terms of this
+ License, through a publicly available network server or other
+ readily accessible means, then you must either (1) cause the
+ Corresponding Source to be so available, or (2) arrange to deprive
+ yourself of the benefit of the patent license for this particular
+ work, or (3) arrange, in a manner consistent with the requirements
+ of this License, to extend the patent license to downstream
+ recipients. "Knowingly relying" means you have actual knowledge
+ that, but for the patent license, your conveying the covered work
+ in a country, or your recipient's use of the covered work in a
+ country, would infringe one or more identifiable patents in that
+ country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+ arrangement, you convey, or propagate by procuring conveyance of, a
+ covered work, and grant a patent license to some of the parties
+ receiving the covered work authorizing them to use, propagate,
+ modify or convey a specific copy of the covered work, then the
+ patent license you grant is automatically extended to all
+ recipients of the covered work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+ the scope of its coverage, prohibits the exercise of, or is
+ conditioned on the non-exercise of one or more of the rights that
+ are specifically granted under this License. You may not convey a
+ covered work if you are a party to an arrangement with a third
+ party that is in the business of distributing software, under which
+ you make payment to the third party based on the extent of your
+ activity of conveying the work, and under which the third party
+ grants, to any of the parties who would receive the covered work
+ from you, a discriminatory patent license (a) in connection with
+ copies of the covered work conveyed by you (or copies made from
+ those copies), or (b) primarily for and in connection with specific
+ products or compilations that contain the covered work, unless you
+ entered into that arrangement, or that patent license was granted,
+ prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+ any implied license or other defenses to infringement that may
+ otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement
+ or otherwise) that contradict the conditions of this License, they
+ do not excuse you from the conditions of this License. If you
+ cannot convey a covered work so as to satisfy simultaneously your
+ obligations under this License and any other pertinent obligations,
+ then as a consequence you may not convey it at all. For example,
+ if you agree to terms that obligate you to collect a royalty for
+ further conveying from those to whom you convey the Program, the
+ only way you could satisfy both those terms and this License would
+ be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+ permission to link or combine any covered work with a work licensed
+ under version 3 of the GNU Affero General Public License into a
+ single combined work, and to convey the resulting work. The terms
+ of this License will continue to apply to the part which is the
+ covered work, but the special requirements of the GNU Affero
+ General Public License, section 13, concerning interaction through
+ a network will apply to the combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new
+ versions of the GNU General Public License from time to time. Such
+ new versions will be similar in spirit to the present version, but
+ may differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+ Program specifies that a certain numbered version of the GNU
+ General Public License "or any later version" applies to it, you
+ have the option of following the terms and conditions either of
+ that numbered version or of any later version published by the Free
+ Software Foundation. If the Program does not specify a version
+ number of the GNU General Public License, you may choose any
+ version ever published by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+ versions of the GNU General Public License can be used, that
+ proxy's public statement of acceptance of a version permanently
+ authorizes you to choose that version for the Program.
+
+ Later license versions may give you additional or different
+ permissions. However, no additional obligations are imposed on any
+ author or copyright holder as a result of your choosing to follow a
+ later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+ APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
+ COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS"
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE
+ RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.
+ SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+ NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+ WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES
+ AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+ DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+ THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+ BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+ above cannot be given local legal effect according to their terms,
+ reviewing courts shall apply local law that most closely
+ approximates an absolute waiver of all civil liability in
+ connection with the Program, unless a warranty or assumption of
+ liability accompanies a copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+=============================================
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
+ Copyright (C) YEAR NAME OF AUTHOR
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice
+like this when it starts in an interactive mode:
+
+ PROGRAM Copyright (C) YEAR NAME OF AUTHOR
+ This program comes with ABSOLUTELY NO WARRANTY; for details
+ type 'show w'. This is free software, and you are
+ welcome to redistribute it under certain conditions;
+ type 'show c' for details.
+
+ The hypothetical commands 'show w' and 'show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+ You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see <http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+
+File: gnupg.info, Node: Contributors, Next: Glossary, Prev: Copying, Up: Top
+
+Contributors to GnuPG
+*********************
+
+The GnuPG project would like to thank its many contributors. Without
+them the project would not have been nearly as successful as it has
+been. Any omissions in this list are accidental. Feel free to contact
+the maintainer if you have been left out or some of your contributions
+are not listed.
+
+ David Shaw, Matthew Skala, Michael Roth, Niklas Hernaeus, Nils
+Ellmenreich, R�mi Guyomarch, Stefan Bellon, Timo Schulz and Werner Koch
+wrote the code. Birger Langkjer, Daniel Resare, Dokianakis Theofanis,
+Edmund GRIMLEY EVANS, Ga�l Qu�ri, Gregory Steuck, Nagy Ferenc L�szl�,
+Ivo Timmermans, Jacobo Tarri'o Barreiro, Janusz Aleksander Urbanowicz,
+Jedi Lin, Jouni Hiltunen, Laurentiu Buzdugan, Magda Procha'zkova',
+Michael Anckaert, Michal Majer, Marco d'Itri, Nilgun Belma Buguner,
+Pedro Morais, Tedi Heriyanto, Thiago Jung Bauermann, Rafael Caetano dos
+Santos, Toomas Soome, Urko Lusa, Walter Koch, Yosiaki IIDA did the
+official translations. Mike Ashley wrote and maintains the GNU Privacy
+Handbook. David Scribner is the current FAQ editor. Lorenzo
+Cappelletti maintains the web site.
+
+ The new modularized architecture of gnupg 1.9 as well as the
+X.509/CMS part has been developed as part of the �gypten project.
+Direct contributors to this project are: Bernhard Herzog, who did
+extensive testing and tracked down a lot of bugs. Bernhard Reiter, who
+made sure that we met the specifications and the deadlines. He did
+extensive testing and came up with a lot of suggestions. Jan-Oliver
+Wagner made sure that we met the specifications and the deadlines. He
+also did extensive testing and came up with a lot of suggestions.
+Karl-Heinz Zimmer and Marc Mutz had to struggle with all the bugs and
+misconceptions while working on KDE integration. Marcus Brinkman
+extended GPGME, cleaned up the Assuan code and fixed bugs all over the
+place. Moritz Schulte took over Libgcrypt maintenance and developed it
+into a stable an useful library. Steffen Hansen had a hard time to
+write the dirmngr due to underspecified interfaces. Thomas Koester did
+extensive testing and tracked down a lot of bugs. Werner Koch designed
+the system and wrote most of the code.
+
+ The following people helped greatly by suggesting improvements,
+testing, fixing bugs, providing resources and doing other important
+tasks: Adam Mitchell, Albert Chin, Alec Habig, Allan Clark, Anand
+Kumria, Andreas Haumer, Anthony Mulcahy, Ariel T Glenn, Bob Mathews,
+Bodo Moeller, Brendan O'Dea, Brenno de Winter, Brian M. Carlson, Brian
+Moore, Brian Warner, Bryan Fullerton, Caskey L. Dickson, Cees van de
+Griend, Charles Levert, Chip Salzenberg, Chris Adams, Christian Biere,
+Christian Kurz, Christian von Roques, Christopher Oliver, Christian
+Recktenwald, Dan Winship, Daniel Eisenbud, Daniel Koening, Dave Dykstra,
+David C Niemi, David Champion, David Ellement, David Hallinan, David
+Hollenberg, David Mathog, David R. Bergstein, Detlef Lannert, Dimitri,
+Dirk Lattermann, Dirk Meyer, Disastry, Douglas Calvert, Ed Boraas,
+Edmund GRIMLEY EVANS, Edwin Woudt, Enzo Michelangeli, Ernst Molitor,
+Fabio Coatti, Felix von Leitner, fish stiqz, Florian Weimer, Francesco
+Potorti, Frank Donahoe, Frank Heckenbach, Frank Stajano, Frank Tobin,
+Gabriel Rosenkoetter, Ga�l Qu�ri, Gene Carter, Geoff Keating, Georg
+Schwarz, Giampaolo Tomassoni, Gilbert Fernandes, Greg Louis, Greg
+Troxel, Gregory Steuck, Gregery Barton, Harald Denker, Holger Baust,
+Hendrik Buschkamp, Holger Schurig, Holger Smolinski, Holger Trapp, Hugh
+Daniel, Huy Le, Ian McKellar, Ivo Timmermans, Jan Krueger, Jan
+Niehusmann, Janusz A. Urbanowicz, James Troup, Jean-loup Gailly, Jeff
+Long, Jeffery Von Ronne, Jens Bachem, Jeroen C. van Gelderen, J Horacio
+MG, J. Michael Ashley, Jim Bauer, Jim Small, Joachim Backes, Joe Rhett,
+John A. Martin, Johnny Teve�en, J�rg Schilling, Jos Backus, Joseph
+Walton, Juan F. Codagnone, Jun Kuriyama, Kahil D. Jallad, Karl Fogel,
+Karsten Thygesen, Katsuhiro Kondou, Kazu Yamamoto, Keith Clayton, Kevin
+Ryde, Klaus Singvogel, Kurt Garloff, Lars Kellogg-Stedman, L. Sassaman,
+M Taylor, Marcel Waldvogel, Marco d'Itri, Marco Parrone, Marcus
+Brinkmann, Mark Adler, Mark Elbrecht, Mark Pettit, Markus Friedl, Martin
+Kahlert, Martin Hamilton, Martin Schulte, Matt Kraai, Matthew Skala,
+Matthew Wilcox, Matthias Urlichs, Max Valianskiy, Michael Engels,
+Michael Fischer v. Mollard, Michael Roth, Michael Sobolev, Michael
+Tokarev, Nicolas Graner, Mike McEwan, Neal H Walfield, Nelson H. F.
+Beebe, NIIBE Yutaka, Niklas Hernaeus, Nimrod Zimerman, N J Doye, Oliver
+Haakert, Oskari J��skel�inen, Pascal Scheffers, Paul D. Smith, Per
+Cederqvist, Phil Blundell, Philippe Laliberte, Peter Fales, Peter
+Gutmann, Peter Marschall, Peter Valchev, Piotr Krukowiecki, QingLong,
+Ralph Gillen, Rat, Reinhard Wobst, R�mi Guyomarch, Reuben Sumner,
+Richard Outerbridge, Robert Joop, Roddy Strachan, Roger Sondermann,
+Roland Rosenfeld, Roman Pavlik, Ross Golder, Ryan Malayter, Sam Roberts,
+Sami Tolvanen, Sean MacLennan, Sebastian Klemke, Serge Munhoven, SL
+Baur, Stefan Bellon, Dr.Stefan.Dalibor, Stefan Karrmann, Stefan Keller,
+Steffen Ullrich, Steffen Zahn, Steven Bakker, Steven Murdoch, Susanne
+Schultz, Ted Cabeen, Thiago Jung Bauermann, Thijmen Klok, Thomas
+Roessler, Tim Mooney, Timo Schulz, Todd Vierling, TOGAWA Satoshi, Tom
+Spindler, Tom Zerucha, Tomas Fasth, Tommi Komulainen, Thomas Klausner,
+Tomasz Kozlowski, Thomas Mikkelsen, Ulf M�ller, Urko Lusa, Vincent P.
+Broman, Volker Quetschke, W Lewis, Walter Hofmann, Walter Koch, Wayne
+Chapeskie, Wim Vandeputte, Winona Brown, Yosiaki IIDA, Yoshihiro Kajiki
+and Gerlinde Klaes.
+
+ This software has been made possible by the previous work of Chris
+Wedgwood, Jean-loup Gailly, Jon Callas, Mark Adler, Martin Hellmann Paul
+Kendall, Philip R. Zimmermann, Peter Gutmann, Philip A. Nelson, Taher
+Elgamal, Torbjorn Granlund, Whitfield Diffie, some unknown NSA
+mathematicians and all the folks who have worked hard to create complete
+and free operating systems.
+
+ And finally we'd like to thank everyone who uses these tools, submits
+bug reports and generally reminds us why we're doing this work in the
+first place.
+
+
+File: gnupg.info, Node: Glossary, Next: Option Index, Prev: Contributors, Up: Top
+
+Glossary
+********
+
+'ARL'
+ The _Authority Revocation List_ is technical identical to a CRL but
+ used for CAs and not for end user certificates.
+
+'Chain model'
+ Verification model for X.509 which uses the creation date of a
+ signature as the date the validation starts and in turn checks that
+ each certificate has been issued within the time frame, the issuing
+ certificate was valid. This allows the verification of signatures
+ after the CA's certificate expired. The validation test also
+ required an online check of the certificate status. The chain
+ model is required by the German signature law. See also _Shell
+ model_.
+
+'CMS'
+ The _Cryptographic Message Standard_ describes a message format for
+ encryption and digital signing. It is closely related to the X.509
+ certificate format. CMS was formerly known under the name 'PKCS#7'
+ and is described by 'RFC3369'.
+
+'CRL'
+ The _Certificate Revocation List_ is a list containing certificates
+ revoked by the issuer.
+
+'CSR'
+ The _Certificate Signing Request_ is a message send to a CA to ask
+ them to issue a new certificate. The data format of such a signing
+ request is called PCKS#10.
+
+'OpenPGP'
+ A data format used to build a PKI and to exchange encrypted or
+ signed messages. In contrast to X.509, OpenPGP also includes the
+ message format but does not explicitly demand a specific PKI.
+ However any kind of PKI may be build upon the OpenPGP protocol.
+
+'Keygrip'
+ This term is used by GnuPG to describe a 20 byte hash value used to
+ identify a certain key without referencing to a concrete protocol.
+ It is used internally to access a private key. Usually it is shown
+ and entered as a 40 character hexadecimal formatted string.
+
+'OCSP'
+ The _Online Certificate Status Protocol_ is used as an alternative
+ to a CRL. It is described in 'RFC 2560'.
+
+'PSE'
+ The _Personal Security Environment_ describes a database to store
+ private keys. This is either a smartcard or a collection of files
+ on a disk; the latter is often called a Soft-PSE.
+
+'Shell model'
+ The standard model for validation of certificates under X.509. At
+ the time of the verification all certificates must be valid and not
+ expired. See also _Chain mode_.
+
+'X.509'
+ Description of a PKI used with CMS. It is for example defined by
+ 'RFC3280'.
+
+
+File: gnupg.info, Node: Option Index, Next: Index, Prev: Glossary, Up: Top
+
+Option Index
+************
+
+
+* Menu:
+
+* add-servers: Dirmngr Options. (line 195)
+* agent-program: GPG Configuration Options.
- (line 690)
++ (line 696)
+* 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-emacs-pinentry: Agent Options. (line 175)
+* allow-freeform-uid: GPG Esoteric Options.
+ (line 335)
- * allow-loopback-pinentry: Agent Options. (line 155)
++* allow-loopback-pinentry: Agent Options. (line 161)
+* allow-multiple-messages: GPG Esoteric Options.
+ (line 472)
+* allow-non-selfsigned-uid: GPG Esoteric Options.
+ (line 330)
+* allow-ocsp: Dirmngr Options. (line 212)
- * allow-preset-passphrase: Agent Options. (line 151)
++* allow-preset-passphrase: Agent Options. (line 156)
+* allow-secret-key-import: GPG Esoteric Options.
+ (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 455)
+* ask-cert-level: GPG Configuration Options.
- (line 334)
++ (line 336)
+* ask-sig-expire: GPG Esoteric Options.
+ (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 677)
++ (line 683)
+* auto-issuer-key-retrieve: Certificate Options. (line 50)
+* auto-key-locate: GPG Configuration Options.
- (line 472)
++ (line 474)
+* base64: Input and Output. (line 11)
+* batch: Agent Options. (line 44)
+* batch <1>: GPG Configuration Options.
+ (line 43)
+* bzip2-compress-level: GPG Configuration Options.
- (line 308)
++ (line 310)
+* bzip2-decompress-lowmem: GPG Configuration Options.
- (line 318)
++ (line 320)
+* 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-passphrase-pattern: Agent Options. (line 225)
+* check-sigs: Operational GPG Commands.
+ (line 139)
+* check-trustdb: Operational GPG Commands.
- (line 298)
++ (line 299)
+* 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 634)
++ (line 640)
+* compress-algo: GPG Esoteric Options.
+ (line 204)
+* compress-level: GPG Configuration Options.
- (line 308)
- * csh: Agent Options. (line 129)
++ (line 310)
++* csh: Agent Options. (line 134)
+* csh <1>: Dirmngr Options. (line 81)
+* ctapi-driver: Scdaemon Options. (line 145)
+* daemon: Agent Commands. (line 27)
+* daemon <1>: Dirmngr Commands. (line 27)
+* daemon <2>: Scdaemon Commands. (line 31)
+* dearmor: Operational GPG Commands.
- (line 352)
++ (line 353)
+* 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-pinentry: Agent Options. (line 122)
+* debug-quick-random: Agent Options. (line 110)
+* debug-wait: Agent Options. (line 105)
+* debug-wait <1>: Dirmngr Options. (line 73)
+* debug-wait <2>: Scdaemon Options. (line 99)
+* debug-wait <3>: Scdaemon Options. (line 104)
+* decode: Invoking gpg-connect-agent.
+ (line 95)
+* decrypt: Operational GPG Commands.
+ (line 52)
+* decrypt <1>: Operational GPGSM Commands.
+ (line 11)
+* decrypt <2>: gpg-zip. (line 22)
+* decrypt-files: Operational GPG Commands.
+ (line 100)
- * default-cache-ttl: Agent Options. (line 180)
- * default-cache-ttl <1>: Agent Options. (line 186)
++* default-cache-ttl: Agent Options. (line 186)
++* default-cache-ttl <1>: Agent Options. (line 192)
+* default-cert-expire: GPG Esoteric Options.
+ (line 461)
+* default-cert-level: GPG Configuration Options.
- (line 342)
++ (line 344)
+* default-key: GPG Configuration Options.
+ (line 10)
+* default-key <1>: Input and Output. (line 34)
+* default-keyserver-url: GPG Esoteric Options.
+ (line 500)
+* default-preference-list: GPG Esoteric Options.
+ (line 495)
+* default-recipient: GPG Configuration Options.
+ (line 19)
+* default-recipient-self: GPG Configuration Options.
+ (line 23)
+* default-sig-expire: GPG Esoteric Options.
+ (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 55)
+* 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 697)
++ (line 703)
+* 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 284)
++* disable-check-own-socket: Agent Options. (line 290)
+* disable-cipher-algo: GPG Esoteric Options.
+ (line 235)
+* disable-crl-checks: Certificate Options. (line 13)
+* disable-dsa2: GPG Configuration Options.
- (line 183)
++ (line 185)
+* disable-http: Dirmngr Options. (line 132)
+* disable-large-rsa: GPG Configuration Options.
+ (line 176)
+* disable-ldap: Dirmngr Options. (line 129)
+* disable-mdc: OpenPGP Options. (line 30)
+* disable-ocsp: Certificate Options. (line 41)
+* disable-pinpad: Scdaemon Options. (line 189)
+* disable-policy-checks: Certificate Options. (line 8)
+* disable-pubkey-algo: GPG Esoteric Options.
+ (line 240)
- * disable-scdaemon: Agent Options. (line 278)
++* disable-scdaemon: Agent Options. (line 284)
+* disable-trusted-cert-crl-check: Certificate Options. (line 19)
- * display: Agent Options. (line 302)
++* display: Agent Options. (line 308)
+* display-charset: GPG Configuration Options.
- (line 263)
++ (line 265)
+* display-charset:iso-8859-1: GPG Configuration Options.
- (line 272)
++ (line 274)
+* display-charset:iso-8859-15: GPG Configuration Options.
- (line 278)
++ (line 280)
+* display-charset:iso-8859-2: GPG Configuration Options.
- (line 275)
++ (line 277)
+* display-charset:koi8-r: GPG Configuration Options.
- (line 281)
++ (line 283)
+* display-charset:utf-8: GPG Configuration Options.
- (line 284)
++ (line 286)
+* 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 60)
+* emit-version: GPG Esoteric Options.
+ (line 109)
+* enable-crl-checks: Certificate Options. (line 13)
+* enable-dsa2: GPG Configuration Options.
- (line 183)
++ (line 185)
+* enable-large-rsa: GPG Configuration Options.
+ (line 176)
+* enable-ocsp: Certificate Options. (line 41)
- * enable-passphrase-history: Agent Options. (line 238)
++* enable-passphrase-history: Agent Options. (line 244)
+* 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 322)
++* enable-putty-support: Agent Options. (line 328)
+* enable-special-filenames: GPG Esoteric Options.
+ (line 482)
- * enable-ssh-support: Agent Options. (line 322)
++* enable-ssh-support: Agent Options. (line 328)
+* enable-trusted-cert-crl-check: Certificate Options. (line 19)
+* enarmor: Operational GPG Commands.
- (line 352)
++ (line 353)
+* 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)
++* enforce-passphrase-constraints: Agent Options. (line 210)
+* escape-from-lines: GPG Esoteric Options.
+ (line 265)
+* exec: Invoking gpg-connect-agent.
+ (line 65)
+* exec-path: GPG Configuration Options.
- (line 207)
++ (line 209)
+* exit-on-status-write-error: GPG Configuration Options.
- (line 725)
++ (line 731)
+* expert: GPG Configuration Options.
- (line 783)
++ (line 789)
+* 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 313)
++ (line 314)
+* 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)
+* export-ssh-key: Operational GPG Commands.
+ (line 238)
+* extra-digest-algo: Esoteric Options. (line 7)
- * extra-socket: Agent Options. (line 312)
++* extra-socket: Agent Options. (line 318)
+* 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 401)
+* fetch-crl: Dirmngr Commands. (line 44)
+* fetch-keys: Operational GPG Commands.
+ (line 283)
+* 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 34)
+* gen-key <2>: Certificate Management.
+ (line 7)
+* gen-prime: Operational GPG Commands.
- (line 347)
++ (line 348)
+* gen-random: Operational GPG Commands.
- (line 340)
++ (line 341)
+* gen-revoke: OpenPGP Key Management.
+ (line 42)
+* gnupg: Compliance Options. (line 12)
+* gnutls-debug: Dirmngr Options. (line 70)
+* gpg: gpg-zip. (line 50)
+* gpg-agent-info: GPG Configuration Options.
- (line 687)
++ (line 693)
+* gpg-args: gpg-zip. (line 53)
+* gpgconf-list: GPG Esoteric Options.
+ (line 516)
+* gpgconf-test: GPG Esoteric Options.
+ (line 520)
+* group: GPG Key related Options.
+ (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 242)
++ (line 244)
+* homedir <2>: Configuration Options.
+ (line 16)
+* homedir <3>: Scdaemon Options. (line 13)
+* homedir <4>: gpgv. (line 55)
+* homedir <5>: Invoking gpg-connect-agent.
+ (line 21)
+* homedir <6>: Invoking symcryptrun.
+ (line 36)
+* honor-http-proxy: Dirmngr Options. (line 151)
+* http-proxy: Dirmngr Options. (line 155)
- * ignore-cache-for-signing: Agent Options. (line 174)
++* ignore-cache-for-signing: Agent Options. (line 180)
+* ignore-cert-extension: Dirmngr Options. (line 261)
+* ignore-cert-extension <1>: Certificate Options. (line 70)
+* ignore-crc-error: GPG Esoteric Options.
+ (line 355)
+* ignore-http-dp: Dirmngr Options. (line 135)
+* ignore-ldap-dp: Dirmngr Options. (line 142)
+* ignore-mdc-error: GPG Esoteric Options.
+ (line 362)
+* ignore-ocsp-service-url: Dirmngr Options. (line 147)
+* ignore-time-conflict: GPG Esoteric Options.
+ (line 341)
+* ignore-time-conflict <1>: gpgv. (line 49)
+* ignore-valid-from: GPG Esoteric Options.
+ (line 348)
+* import: Operational GPG Commands.
+ (line 252)
+* import <1>: Certificate Management.
+ (line 98)
+* import-options: GPG Input and Output.
+ (line 29)
+* import-ownertrust: Operational GPG Commands.
- (line 319)
++ (line 320)
+* include-certs: CMS Options. (line 7)
+* interactive: GPG Esoteric Options.
+ (line 19)
- * keep-display: Agent Options. (line 307)
- * keep-tty: Agent Options. (line 307)
++* keep-display: Agent Options. (line 313)
++* keep-tty: Agent Options. (line 313)
+* keydb-clear-some-cert-flags: Certificate Management.
+ (line 51)
+* keyedit:addcardkey: OpenPGP Key Management.
- (line 201)
++ (line 203)
+* keyedit:addkey: OpenPGP Key Management.
- (line 198)
++ (line 200)
+* keyedit:addphoto: OpenPGP Key Management.
- (line 120)
++ (line 122)
+* keyedit:addrevoker: OpenPGP Key Management.
- (line 249)
++ (line 251)
+* keyedit:adduid: OpenPGP Key Management.
- (line 117)
++ (line 119)
+* keyedit:bkuptocard: OpenPGP Key Management.
- (line 215)
++ (line 217)
+* keyedit:check: OpenPGP Key Management.
- (line 113)
++ (line 115)
+* keyedit:clean: OpenPGP Key Management.
- (line 262)
++ (line 264)
+* keyedit:cross-certify: OpenPGP Key Management.
- (line 276)
++ (line 278)
+* keyedit:delkey: OpenPGP Key Management.
- (line 226)
++ (line 228)
+* keyedit:delsig: OpenPGP Key Management.
- (line 103)
++ (line 105)
+* keyedit:deluid: OpenPGP Key Management.
- (line 130)
++ (line 132)
+* keyedit:disable: OpenPGP Key Management.
- (line 245)
++ (line 247)
+* keyedit:enable: OpenPGP Key Management.
- (line 245)
++ (line 247)
+* keyedit:expire: OpenPGP Key Management.
- (line 234)
++ (line 236)
+* keyedit:key: OpenPGP Key Management.
+ (line 69)
+* keyedit:keyserver: OpenPGP Key Management.
- (line 147)
++ (line 149)
+* keyedit:keytocard: OpenPGP Key Management.
- (line 204)
++ (line 206)
+* keyedit:lsign: OpenPGP Key Management.
+ (line 80)
+* keyedit:minimize: OpenPGP Key Management.
- (line 271)
++ (line 273)
+* keyedit:notation: OpenPGP Key Management.
- (line 154)
++ (line 156)
+* keyedit:nrsign: OpenPGP Key Management.
+ (line 85)
+* keyedit:passwd: OpenPGP Key Management.
- (line 255)
++ (line 257)
+* keyedit:pref: OpenPGP Key Management.
- (line 162)
++ (line 164)
+* keyedit:primary: OpenPGP Key Management.
- (line 139)
++ (line 141)
+* keyedit:quit: OpenPGP Key Management.
- (line 287)
++ (line 289)
+* keyedit:revkey: OpenPGP Key Management.
- (line 231)
++ (line 233)
+* keyedit:revsig: OpenPGP Key Management.
- (line 108)
++ (line 110)
+* keyedit:revuid: OpenPGP Key Management.
- (line 136)
++ (line 138)
+* keyedit:save: OpenPGP Key Management.
- (line 284)
++ (line 286)
+* keyedit:setpref: OpenPGP Key Management.
- (line 174)
++ (line 176)
+* keyedit:showphoto: OpenPGP Key Management.
- (line 127)
++ (line 129)
+* keyedit:showpref: OpenPGP Key Management.
- (line 166)
++ (line 168)
+* keyedit:sign: OpenPGP Key Management.
+ (line 73)
+* keyedit:toggle: OpenPGP Key Management.
- (line 258)
++ (line 260)
+* keyedit:trust: OpenPGP Key Management.
- (line 240)
++ (line 242)
+* keyedit:tsign: OpenPGP Key Management.
+ (line 89)
+* keyedit:uid: OpenPGP Key Management.
+ (line 65)
+* keyid-format: GPG Configuration Options.
- (line 519)
++ (line 525)
+* keyring: GPG Configuration Options.
- (line 214)
++ (line 216)
+* keyring <1>: gpgv. (line 36)
+* keyserver: Dirmngr Options. (line 98)
+* keyserver <1>: GPG Configuration Options.
- (line 526)
++ (line 532)
+* keyserver-options: GPG Configuration Options.
- (line 549)
++ (line 555)
+* kill: Invoking gpgconf. (line 60)
+* launch: Invoking gpgconf. (line 53)
- * lc-ctype: Agent Options. (line 302)
- * lc-messages: Agent Options. (line 302)
++* lc-ctype: Agent Options. (line 308)
++* lc-messages: Agent Options. (line 308)
+* 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 734)
++ (line 740)
+* list-archive: gpg-zip. (line 43)
+* list-chain: Certificate Management.
+ (line 31)
+* list-config: GPG Esoteric Options.
+ (line 505)
+* list-crls: Dirmngr Commands. (line 32)
+* list-gcrypt-config: GPG Esoteric Options.
+ (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 63)
+* list-options:show-keyring: GPG Configuration Options.
+ (line 112)
+* list-options:show-keyserver-urls: GPG Configuration Options.
+ (line 96)
+* list-options:show-notations: GPG Configuration Options.
+ (line 91)
+* list-options:show-photos: GPG Configuration Options.
+ (line 71)
+* list-options:show-policy-urls: GPG Configuration Options.
+ (line 85)
+* list-options:show-sig-expire: GPG Configuration Options.
+ (line 116)
+* list-options:show-sig-subpackets: GPG Configuration Options.
+ (line 120)
+* list-options:show-std-notations: GPG Configuration Options.
+ (line 91)
+* list-options:show-uid-validity: GPG Configuration Options.
+ (line 100)
+* list-options:show-unusable-subkeys: GPG Configuration Options.
+ (line 108)
+* list-options:show-unusable-uids: GPG Configuration Options.
+ (line 104)
+* list-options:show-usage: GPG Configuration Options.
+ (line 79)
+* list-options:show-user-notations: GPG Configuration Options.
+ (line 91)
+* list-packets: Operational GPG Commands.
+ (line 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 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 714)
++ (line 720)
+* lock-never: GPG Configuration Options.
- (line 718)
++ (line 724)
+* lock-once: GPG Configuration Options.
- (line 710)
- * log-file: Agent Options. (line 139)
++ (line 716)
++* log-file: Agent Options. (line 144)
+* log-file <1>: Dirmngr Options. (line 33)
+* log-file <2>: GPG Esoteric Options.
+ (line 83)
+* log-file <3>: Configuration Options.
+ (line 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 322)
++ (line 324)
+* mangle-dos-filenames: GPG Configuration Options.
- (line 326)
++ (line 328)
+* marginals-needed: GPG Configuration Options.
- (line 638)
- * max-cache-ttl: Agent Options. (line 192)
- * max-cache-ttl-ssh: Agent Options. (line 198)
++ (line 644)
++* max-cache-ttl: Agent Options. (line 198)
++* max-cache-ttl-ssh: Agent Options. (line 204)
+* max-cert-depth: GPG Configuration Options.
- (line 664)
++ (line 670)
+* max-output: GPG Input and Output.
+ (line 19)
- * max-passphrase-days: Agent Options. (line 233)
++* max-passphrase-days: Agent Options. (line 239)
+* max-replies: Dirmngr Options. (line 258)
+* min-cert-level: GPG Configuration Options.
- (line 371)
- * min-passphrase-len: Agent Options. (line 208)
- * min-passphrase-nonalpha: Agent Options. (line 213)
++ (line 373)
++* min-passphrase-len: Agent Options. (line 214)
++* min-passphrase-nonalpha: Agent Options. (line 219)
+* multi-server: Scdaemon Commands. (line 26)
+* multifile: Operational GPG Commands.
+ (line 86)
+* nameserver: Dirmngr Options. (line 121)
+* no: GPG Configuration Options.
+ (line 60)
- * no-allow-external-cache: Agent Options. (line 159)
- * no-allow-mark-trusted: Agent Options. (line 146)
++* no-allow-external-cache: Agent Options. (line 165)
++* no-allow-loopback-pinentry: Agent Options. (line 161)
++* no-allow-mark-trusted: Agent Options. (line 151)
+* no-armor: GPG Input and Output.
+ (line 12)
+* no-autostart: GPG Configuration Options.
- (line 703)
++ (line 709)
+* no-autostart <1>: Configuration Options.
+ (line 67)
+* no-autostart <2>: Invoking gpg-connect-agent.
+ (line 77)
+* no-batch: GPG Configuration Options.
+ (line 43)
- * no-common-certs-import: Esoteric Options. (line 105)
++* no-common-certs-import: Esoteric Options. (line 124)
+* no-default-keyring: GPG Esoteric Options.
+ (line 386)
+* no-default-recipient: GPG Configuration Options.
+ (line 29)
- * no-detach: Agent Options. (line 122)
++* no-detach: Agent Options. (line 127)
+* no-detach <1>: Scdaemon Options. (line 131)
+* no-encrypt-to: GPG Key related Options.
+ (line 41)
+* no-expensive-trust-checks: GPG Esoteric Options.
+ (line 487)
+* no-ext-connect: Invoking gpg-connect-agent.
+ (line 72)
- * no-grab: Agent Options. (line 135)
++* no-grab: Agent Options. (line 140)
+* no-greeting: GPG Configuration Options.
- (line 748)
++ (line 754)
+* no-groups: GPG Key related Options.
+ (line 63)
+* no-literal: GPG Esoteric Options.
+ (line 409)
+* no-mangle-dos-filenames: GPG Configuration Options.
- (line 326)
++ (line 328)
+* no-mdc-warning: GPG Configuration Options.
- (line 767)
++ (line 773)
+* no-options: GPG Configuration Options.
- (line 301)
++ (line 303)
+* no-random-seed-file: GPG Configuration Options.
- (line 742)
++ (line 748)
+* no-secmem-warning: GPG Configuration Options.
- (line 751)
++ (line 757)
+* no-secmem-warning <1>: Configuration Options.
+ (line 74)
+* no-sig-cache: GPG Configuration Options.
- (line 667)
++ (line 673)
+* no-skip-hidden-recipients: GPG Key related Options.
+ (line 90)
+* no-tty: GPG Configuration Options.
+ (line 52)
- * no-use-standard-socket: Agent Options. (line 292)
++* no-use-standard-socket: Agent Options. (line 298)
+* no-verbose: GPG Configuration Options.
+ (line 36)
+* not-dash-escaped: GPG Esoteric Options.
+ (line 255)
+* ocsp: dirmngr-client. (line 61)
+* ocsp-current-period: Dirmngr Options. (line 253)
+* ocsp-max-clock-skew: Dirmngr Options. (line 245)
+* ocsp-max-period: Dirmngr Options. (line 249)
+* ocsp-responder: Dirmngr Options. (line 219)
+* ocsp-signer: Dirmngr Options. (line 224)
+* only-ldap-proxy: Dirmngr Options. (line 166)
+* openpgp: Compliance Options. (line 19)
+* options: Agent Options. (line 7)
+* options <1>: Dirmngr Options. (line 7)
+* options <2>: Dirmngr Options. (line 12)
+* options <3>: GPG Configuration Options.
- (line 296)
++ (line 298)
+* 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 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-fd <1>: Esoteric Options. (line 100)
+* passphrase-file: GPG Esoteric Options.
+ (line 286)
+* passphrase-repeat: GPG Esoteric Options.
+ (line 272)
+* passwd: OpenPGP Key Management.
- (line 350)
++ (line 356)
+* passwd <1>: Certificate Management.
+ (line 108)
+* pcsc-driver: Scdaemon Options. (line 139)
+* pem: dirmngr-client. (line 58)
+* permission-warning: GPG Configuration Options.
- (line 754)
++ (line 760)
+* personal-cipher-preferences: OpenPGP Options. (line 35)
+* personal-compress-preferences: OpenPGP Options. (line 53)
+* personal-digest-preferences: OpenPGP Options. (line 44)
+* pgp6: Compliance Options. (line 34)
+* pgp7: Compliance Options. (line 44)
+* pgp8: Compliance Options. (line 50)
+* photo-viewer: GPG Configuration Options.
- (line 189)
- * pinentry-invisible-char: Agent Options. (line 241)
++ (line 191)
++* pinentry-invisible-char: Agent Options. (line 247)
+* pinentry-mode: GPG Esoteric Options.
+ (line 303)
- * pinentry-program: Agent Options. (line 252)
- * pinentry-timeout: Agent Options. (line 246)
- * pinentry-touch-file: Agent Options. (line 265)
++* pinentry-mode <1>: Esoteric Options. (line 109)
++* pinentry-program: Agent Options. (line 258)
++* pinentry-timeout: Agent Options. (line 252)
++* pinentry-touch-file: Agent Options. (line 271)
+* ping: dirmngr-client. (line 69)
+* policy-file: Configuration Options.
+ (line 43)
+* prefer-system-dirmngr: Configuration Options.
+ (line 58)
+* preserve-permissions: GPG Esoteric Options.
+ (line 490)
+* preset: Invoking gpg-preset-passphrase.
+ (line 20)
+* primary-keyring: GPG Configuration Options.
- (line 230)
++ (line 232)
+* print-dane-records: GPG Input and Output.
+ (line 125)
+* print-md: Operational GPG Commands.
- (line 335)
++ (line 336)
+* 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 343)
++ (line 349)
+* quick-gen-key: OpenPGP Key Management.
+ (line 9)
+* quick-lsign-key: OpenPGP Key Management.
- (line 328)
++ (line 330)
+* quick-sign-key: OpenPGP Key Management.
- (line 328)
++ (line 330)
+* quiet: Agent Options. (line 41)
+* quiet <1>: GPG Configuration Options.
+ (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 329)
++ (line 330)
+* 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 261)
+* refresh-keys: Operational GPG Commands.
+ (line 265)
+* reload: Invoking gpgconf. (line 48)
+* require-cross-certification: GPG Configuration Options.
- (line 776)
++ (line 782)
+* require-secmem: GPG Configuration Options.
- (line 771)
++ (line 777)
+* 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 79)
+* s2k-digest-algo: OpenPGP Options. (line 68)
+* s2k-mode: OpenPGP Options. (line 72)
- * scdaemon-program: Agent Options. (line 274)
++* scdaemon-program: Agent Options. (line 280)
+* search-keys: Operational GPG Commands.
+ (line 274)
+* secret-keyring: GPG Configuration Options.
- (line 225)
++ (line 227)
+* 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 413)
+* set-notation: GPG Esoteric Options.
+ (line 119)
+* set-policy-url: GPG Esoteric Options.
+ (line 149)
- * sh: Agent Options. (line 129)
++* sh: Agent Options. (line 134)
+* sh <1>: Dirmngr Options. (line 81)
+* show-keyring: Deprecated Options. (line 16)
+* show-notation: Deprecated Options. (line 25)
+* show-photos: Deprecated Options. (line 8)
+* show-policy-url: Deprecated Options. (line 33)
+* show-session-key: GPG Esoteric Options.
+ (line 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 318)
++ (line 320)
+* skip-hidden-recipients: GPG Key related Options.
+ (line 90)
+* skip-verify: GPG Esoteric Options.
+ (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)
++ (line 648)
+* tofu-default-policy <1>: GPG Configuration Options.
- (line 646)
- * tofu-set-policy: Operational GPG Commands.
- (line 357)
++ (line 652)
++* tofu-policy: Operational GPG Commands.
++ (line 358)
+* trust-mode:always: GPG Configuration Options.
- (line 457)
++ (line 459)
+* trust-mode:auto: GPG Configuration Options.
- (line 466)
++ (line 468)
+* trust-mode:classic: GPG Configuration Options.
- (line 392)
++ (line 394)
+* trust-mode:direct: GPG Configuration Options.
- (line 453)
++ (line 455)
+* trust-mode:pgp: GPG Configuration Options.
- (line 387)
++ (line 389)
+* trust-mode:tofu: GPG Configuration Options.
- (line 395)
++ (line 397)
+* trust-mode:tofu+pgp: GPG Configuration Options.
- (line 441)
++ (line 443)
+* trust-model: GPG Configuration Options.
- (line 384)
++ (line 386)
+* trustdb-name: GPG Configuration Options.
- (line 235)
++ (line 237)
+* trusted-key: GPG Configuration Options.
- (line 377)
++ (line 379)
+* try-all-secrets: GPG Key related Options.
+ (line 82)
+* try-secret-key: GPG Key related Options.
+ (line 71)
- * ttyname: Agent Options. (line 302)
- * ttytype: Agent Options. (line 302)
++* ttyname: Agent Options. (line 308)
++* ttytype: Agent Options. (line 308)
+* ungroup: GPG Key related Options.
+ (line 60)
+* update-trustdb: Operational GPG Commands.
- (line 288)
++ (line 289)
+* url: dirmngr-client. (line 94)
+* url <1>: dirmngr-client. (line 98)
+* use-agent: GPG Configuration Options.
- (line 684)
++ (line 690)
+* use-embedded-filename: GPG Esoteric Options.
+ (line 183)
- * use-standard-socket: Agent Options. (line 292)
- * use-standard-socket-p: Agent Options. (line 292)
++* use-standard-socket: Agent Options. (line 298)
++* use-standard-socket-p: Agent Options. (line 298)
+* use-tor: Dirmngr Options. (line 91)
+* utf8-strings: GPG Configuration Options.
- (line 289)
++ (line 291)
+* v: Dirmngr Options. (line 28)
+* v <1>: Configuration Options.
+ (line 38)
+* v <2>: Scdaemon Options. (line 35)
+* v <3>: dirmngr-client. (line 53)
+* validate: dirmngr-client. (line 76)
+* validation-model: Certificate Options. (line 61)
+* verbose: Agent Options. (line 35)
+* verbose <1>: Dirmngr Options. (line 28)
+* verbose <2>: GPG Configuration Options.
+ (line 32)
+* verbose <3>: Configuration Options.
+ (line 38)
+* verbose <4>: Scdaemon Options. (line 35)
+* verbose <5>: watchgnupg. (line 29)
+* verbose <6>: gpgv. (line 28)
+* verbose <7>: Invoking gpg-preset-passphrase.
+ (line 30)
+* verbose <8>: Invoking gpg-connect-agent.
+ (line 14)
+* verbose <9>: dirmngr-client. (line 53)
+* verbose <10>: Invoking symcryptrun.
+ (line 29)
+* verify: Operational GPG Commands.
+ (line 60)
+* verify <1>: Operational GPGSM Commands.
+ (line 20)
+* verify-files: Operational GPG Commands.
+ (line 94)
+* verify-options: GPG Configuration Options.
+ (line 127)
+* verify-options:pka-lookups: GPG Configuration Options.
+ (line 163)
+* verify-options:pka-trust-increase: GPG Configuration Options.
+ (line 170)
+* verify-options:show-keyserver-urls: GPG Configuration Options.
+ (line 146)
+* verify-options:show-notations: GPG Configuration Options.
+ (line 142)
+* verify-options:show-photos: GPG Configuration Options.
+ (line 132)
+* verify-options:show-policy-urls: GPG Configuration Options.
+ (line 136)
+* verify-options:show-primary-uid-only: GPG Configuration Options.
+ (line 158)
+* verify-options:show-std-notations: GPG Configuration Options.
+ (line 142)
+* verify-options:show-uid-validity: GPG Configuration Options.
+ (line 150)
+* verify-options:show-unusable-uids: GPG Configuration Options.
+ (line 154)
+* verify-options:show-user-notations: GPG Configuration Options.
+ (line 142)
+* version: Agent Commands. (line 10)
+* version <1>: Dirmngr Commands. (line 10)
+* version <2>: General GPG Commands.
+ (line 7)
+* version <3>: General GPGSM Commands.
+ (line 7)
+* version <4>: Scdaemon Commands. (line 10)
+* version <5>: watchgnupg. (line 32)
+* version <6>: dirmngr-client. (line 40)
+* version <7>: gpg-zip. (line 62)
+* warranty: General GPG Commands.
+ (line 16)
+* warranty <1>: General GPGSM Commands.
+ (line 15)
+* weak-digest: GPG Esoteric Options.
+ (line 378)
+* weak-digest <1>: gpgv. (line 76)
+* with-colons: GPG Input and Output.
+ (line 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 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)
++ (line 159)
+* with-secret <1>: Input and Output. (line 78)
+* with-validation: Input and Output. (line 60)
- * xauthority: Agent Options. (line 302)
++* with-wkd-hash: GPG Input and Output.
++ (line 154)
++* xauthority: Agent Options. (line 308)
+* yes: GPG Configuration Options.
+ (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 m4/intdiv0.m4
index b8d7817,b8d7817..0000000
deleted file mode 100644,100644
--- a/m4/intdiv0.m4
+++ /dev/null
@@@ -1,70 -1,70 +1,0 @@@
--# intdiv0.m4 serial 1 (gettext-0.11.3)
--dnl Copyright (C) 2002 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--AC_DEFUN([gt_INTDIV0],
--[
-- AC_REQUIRE([AC_PROG_CC])dnl
-- AC_REQUIRE([AC_CANONICAL_HOST])dnl
--
-- AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-- gt_cv_int_divbyzero_sigfpe,
-- [
-- AC_TRY_RUN([
--#include <stdlib.h>
--#include <signal.h>
--
--static void
--#ifdef __cplusplus
--sigfpe_handler (int sig)
--#else
--sigfpe_handler (sig) int sig;
--#endif
--{
-- /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
-- exit (sig != SIGFPE);
--}
--
--int x = 1;
--int y = 0;
--int z;
--int nan;
--
--int main ()
--{
-- signal (SIGFPE, sigfpe_handler);
--/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
--#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-- signal (SIGTRAP, sigfpe_handler);
--#endif
--/* Linux/SPARC yields signal SIGILL. */
--#if defined (__sparc__) && defined (__linux__)
-- signal (SIGILL, sigfpe_handler);
--#endif
--
-- z = x / y;
-- nan = y / y;
-- exit (1);
--}
--], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-- [
-- # Guess based on the CPU.
-- case "$host_cpu" in
-- alpha* | i[34567]86 | m68k | s390*)
-- gt_cv_int_divbyzero_sigfpe="guessing yes";;
-- *)
-- gt_cv_int_divbyzero_sigfpe="guessing no";;
-- esac
-- ])
-- ])
-- case "$gt_cv_int_divbyzero_sigfpe" in
-- *yes) value=1;;
-- *) value=0;;
-- esac
-- AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-- [Define if integer division by zero raises signal SIGFPE.])
--])
diff --cc m4/intl.m4
index 3906a17,3906a17..0000000
deleted file mode 100644,100644
--- a/m4/intl.m4
+++ /dev/null
@@@ -1,259 -1,259 +1,0 @@@
--# intl.m4 serial 3 (gettext-0.16)
--dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--dnl
--dnl This file can can be used in projects which are not available under
--dnl the GNU General Public License or the GNU Library General Public
--dnl License but which still want to provide support for the GNU gettext
--dnl functionality.
--dnl Please note that the actual code of the GNU gettext library is covered
--dnl by the GNU Library General Public License, and the rest of the GNU
--dnl gettext package package is covered by the GNU General Public License.
--dnl They are *not* in the public domain.
--
--dnl Authors:
--dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
--dnl Bruno Haible <haible at clisp.cons.org>, 2000-2006.
--
--AC_PREREQ(2.52)
--
--dnl Checks for all prerequisites of the intl subdirectory,
--dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
--dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
--AC_DEFUN([AM_INTL_SUBDIR],
--[
-- AC_REQUIRE([AC_PROG_INSTALL])dnl
-- AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-- AC_REQUIRE([AC_PROG_CC])dnl
-- AC_REQUIRE([AC_CANONICAL_HOST])dnl
-- AC_REQUIRE([gt_GLIBC2])dnl
-- AC_REQUIRE([AC_PROG_RANLIB])dnl
-- AC_REQUIRE([gl_VISIBILITY])dnl
-- AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
-- AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
-- AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
-- AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
-- AC_REQUIRE([gt_TYPE_WINT_T])dnl
-- AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-- AC_REQUIRE([gt_TYPE_INTMAX_T])
-- AC_REQUIRE([gt_PRINTF_POSIX])
-- AC_REQUIRE([gl_GLIBC21])dnl
-- AC_REQUIRE([gl_XSIZE])dnl
-- AC_REQUIRE([gt_INTL_MACOSX])dnl
--
-- AC_CHECK_TYPE([ptrdiff_t], ,
-- [AC_DEFINE([ptrdiff_t], [long],
-- [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
-- ])
-- AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
-- AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])
--
-- dnl Use the _snprintf function only if it is declared (because on NetBSD it
-- dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-- gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
-- gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
--
-- dnl Use the *_unlocked functions only if they are declared.
-- dnl (because some of them were defined without being declared in Solaris
-- dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-- dnl on Solaris 2.5.1 to run on Solaris 2.6).
-- dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-- gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
--
-- case $gt_cv_func_printf_posix in
-- *yes) HAVE_POSIX_PRINTF=1 ;;
-- *) HAVE_POSIX_PRINTF=0 ;;
-- esac
-- AC_SUBST([HAVE_POSIX_PRINTF])
-- if test "$ac_cv_func_asprintf" = yes; then
-- HAVE_ASPRINTF=1
-- else
-- HAVE_ASPRINTF=0
-- fi
-- AC_SUBST([HAVE_ASPRINTF])
-- if test "$ac_cv_func_snprintf" = yes; then
-- HAVE_SNPRINTF=1
-- else
-- HAVE_SNPRINTF=0
-- fi
-- AC_SUBST([HAVE_SNPRINTF])
-- if test "$ac_cv_func_wprintf" = yes; then
-- HAVE_WPRINTF=1
-- else
-- HAVE_WPRINTF=0
-- fi
-- AC_SUBST([HAVE_WPRINTF])
--
-- AM_LANGINFO_CODESET
-- gt_LC_MESSAGES
--
-- dnl Compilation on mingw and Cygwin needs special Makefile rules, because
-- dnl 1. when we install a shared library, we must arrange to export
-- dnl auxiliary pointer variables for every exported variable,
-- dnl 2. when we install a shared library and a static library simultaneously,
-- dnl the include file specifies __declspec(dllimport) and therefore we
-- dnl must arrange to define the auxiliary pointer variables for the
-- dnl exported variables _also_ in the static library.
-- if test "$enable_shared" = yes; then
-- case "$host_os" in
-- cygwin*) is_woe32dll=yes ;;
-- *) is_woe32dll=no ;;
-- esac
-- else
-- is_woe32dll=no
-- fi
-- WOE32DLL=$is_woe32dll
-- AC_SUBST([WOE32DLL])
--
-- dnl Rename some macros and functions used for locking.
-- AH_BOTTOM([
--#define __libc_lock_t gl_lock_t
--#define __libc_lock_define gl_lock_define
--#define __libc_lock_define_initialized gl_lock_define_initialized
--#define __libc_lock_init gl_lock_init
--#define __libc_lock_lock gl_lock_lock
--#define __libc_lock_unlock gl_lock_unlock
--#define __libc_lock_recursive_t gl_recursive_lock_t
--#define __libc_lock_define_recursive gl_recursive_lock_define
--#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized
--#define __libc_lock_init_recursive gl_recursive_lock_init
--#define __libc_lock_lock_recursive gl_recursive_lock_lock
--#define __libc_lock_unlock_recursive gl_recursive_lock_unlock
--#define glthread_in_use libintl_thread_in_use
--#define glthread_lock_init libintl_lock_init
--#define glthread_lock_lock libintl_lock_lock
--#define glthread_lock_unlock libintl_lock_unlock
--#define glthread_lock_destroy libintl_lock_destroy
--#define glthread_rwlock_init libintl_rwlock_init
--#define glthread_rwlock_rdlock libintl_rwlock_rdlock
--#define glthread_rwlock_wrlock libintl_rwlock_wrlock
--#define glthread_rwlock_unlock libintl_rwlock_unlock
--#define glthread_rwlock_destroy libintl_rwlock_destroy
--#define glthread_recursive_lock_init libintl_recursive_lock_init
--#define glthread_recursive_lock_lock libintl_recursive_lock_lock
--#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock
--#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy
--#define glthread_once libintl_once
--#define glthread_once_call libintl_once_call
--#define glthread_once_singlethreaded libintl_once_singlethreaded
--])
--])
--
--
--dnl Checks for the core files of the intl subdirectory:
--dnl dcigettext.c
--dnl eval-plural.h
--dnl explodename.c
--dnl finddomain.c
--dnl gettextP.h
--dnl gmo.h
--dnl hash-string.h hash-string.c
--dnl l10nflist.c
--dnl libgnuintl.h.in (except the *printf stuff)
--dnl loadinfo.h
--dnl loadmsgcat.c
--dnl localealias.c
--dnl log.c
--dnl plural-exp.h plural-exp.c
--dnl plural.y
--dnl Used by libglocale.
--AC_DEFUN([gt_INTL_SUBDIR_CORE],
--[
-- AC_REQUIRE([AC_C_INLINE])dnl
-- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-- AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-- AC_REQUIRE([AC_FUNC_MMAP])dnl
-- AC_REQUIRE([gt_INTDIV0])dnl
-- AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
-- AC_REQUIRE([gt_INTTYPES_PRI])dnl
-- AC_REQUIRE([gl_LOCK])dnl
--
-- AC_TRY_LINK(
-- [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
-- [],
-- [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,
-- [Define to 1 if the compiler understands __builtin_expect.])])
--
-- AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
-- AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
-- stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
-- argz_next __fsetlocking])
--
-- dnl Use the *_unlocked functions only if they are declared.
-- dnl (because some of them were defined without being declared in Solaris
-- dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-- dnl on Solaris 2.5.1 to run on Solaris 2.6).
-- dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-- gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
-- gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
--
-- AM_ICONV
--
-- dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
-- dnl and a _NL_LOCALE_NAME macro always.
-- AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
-- [AC_TRY_LINK([#include <langinfo.h>
--#include <locale.h>],
-- [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
-- gt_cv_nl_locale_name=yes,
-- gt_cv_nl_locale_name=no)
-- ])
-- if test $gt_cv_nl_locale_name = yes; then
-- AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
-- [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.])
-- fi
--
-- dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-- dnl because plural.y uses bison specific features. It requires at least
-- dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-- dnl compile.
-- dnl bison is only needed for the maintainer (who touches plural.y). But in
-- dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-- dnl the rule in general Makefile. Now, some people carelessly touch the
-- dnl files or have a broken "make" program, hence the plural.c rule will
-- dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-- dnl present or too old.
-- AC_CHECK_PROGS([INTLBISON], [bison])
-- if test -z "$INTLBISON"; then
-- ac_verc_fail=yes
-- else
-- dnl Found it, now check the version.
-- AC_MSG_CHECKING([version of bison])
--changequote(<<,>>)dnl
-- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-- case $ac_prog_version in
-- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
--changequote([,])dnl
-- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-- esac
-- AC_MSG_RESULT([$ac_prog_version])
-- fi
-- if test $ac_verc_fail = yes; then
-- INTLBISON=:
-- fi
--])
--
--
--dnl gt_CHECK_DECL(FUNC, INCLUDES)
--dnl Check whether a function is declared.
--AC_DEFUN([gt_CHECK_DECL],
--[
-- AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
-- [AC_TRY_COMPILE([$2], [
--#ifndef $1
-- char *p = (char *) $1;
--#endif
--], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
-- if test $ac_cv_have_decl_$1 = yes; then
-- gt_value=1
-- else
-- gt_value=0
-- fi
-- AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
-- [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
--])
diff --cc m4/lock.m4
index 0224f2f,0224f2f..0000000
deleted file mode 100644,100644
--- a/m4/lock.m4
+++ /dev/null
@@@ -1,311 -1,311 +1,0 @@@
--# lock.m4 serial 6 (gettext-0.16)
--dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--dnl Tests for a multithreading library to be used.
--dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
--dnl USE_PTH_THREADS, USE_WIN32_THREADS
--dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
--dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
--dnl libtool).
--dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
--dnl programs that really need multithread functionality. The difference
--dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
--dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
--dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
--dnl multithread-safe programs.
--
--AC_DEFUN([gl_LOCK_EARLY],
--[
-- AC_REQUIRE([gl_LOCK_EARLY_BODY])
--])
--
--dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once.
--
--AC_DEFUN([gl_LOCK_EARLY_BODY],
--[
-- dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
-- dnl influences the result of the autoconf tests that test for *_unlocked
-- dnl declarations, on AIX 5 at least. Therefore it must come early.
-- AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
-- AC_BEFORE([$0], [gl_ARGP])dnl
--
-- AC_REQUIRE([AC_CANONICAL_HOST])
-- AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems
-- dnl Check for multithreading.
-- AC_ARG_ENABLE(threads,
--AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
--AC_HELP_STRING([--disable-threads], [build without multithread safety]),
-- [gl_use_threads=$enableval],
-- [case "$host_os" in
-- dnl Disable multithreading by default on OSF/1, because it interferes
-- dnl with fork()/exec(): When msgexec is linked with -lpthread, its child
-- dnl process gets an endless segmentation fault inside execvp().
-- osf*) gl_use_threads=no ;;
-- *) gl_use_threads=yes ;;
-- esac
-- ])
-- if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-- # For using <pthread.h>:
-- case "$host_os" in
-- osf*)
-- # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
-- # groks <pthread.h>. cc also understands the flag -pthread, but
-- # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
-- # 2. putting a flag into CPPFLAGS that has an effect on the linker
-- # causes the AC_TRY_LINK test below to succeed unexpectedly,
-- # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
-- CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-- ;;
-- esac
-- # Some systems optimize for single-threaded programs by default, and
-- # need special flags to disable these optimizations. For example, the
-- # definition of 'errno' in <errno.h>.
-- case "$host_os" in
-- aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
-- solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
-- esac
-- fi
--])
--
--dnl The guts of gl_LOCK. Needs to be expanded only once.
--
--AC_DEFUN([gl_LOCK_BODY],
--[
-- AC_REQUIRE([gl_LOCK_EARLY_BODY])
-- gl_threads_api=none
-- LIBTHREAD=
-- LTLIBTHREAD=
-- LIBMULTITHREAD=
-- LTLIBMULTITHREAD=
-- if test "$gl_use_threads" != no; then
-- dnl Check whether the compiler and linker support weak declarations.
-- AC_MSG_CHECKING([whether imported symbols can be declared weak])
-- gl_have_weak=no
-- AC_TRY_LINK([extern void xyzzy ();
--#pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes])
-- AC_MSG_RESULT([$gl_have_weak])
-- if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-- # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
-- # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY.
-- AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no)
-- if test "$gl_have_pthread_h" = yes; then
-- # Other possible tests:
-- # -lpthreads (FSU threads, PCthreads)
-- # -lgthreads
-- gl_have_pthread=
-- # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
-- # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
-- # the second one only in libpthread, and lock.c needs it.
-- AC_TRY_LINK([#include <pthread.h>],
-- [pthread_mutex_lock((pthread_mutex_t*)0);
-- pthread_mutexattr_init((pthread_mutexattr_t*)0);],
-- [gl_have_pthread=yes])
-- # Test for libpthread by looking for pthread_kill. (Not pthread_self,
-- # since it is defined as a macro on OSF/1.)
-- if test -n "$gl_have_pthread"; then
-- # The program links fine without libpthread. But it may actually
-- # need to link with libpthread in order to create multiple threads.
-- AC_CHECK_LIB(pthread, pthread_kill,
-- [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-- # On Solaris and HP-UX, most pthread functions exist also in libc.
-- # Therefore pthread_in_use() needs to actually try to create a
-- # thread: pthread_create from libc will fail, whereas
-- # pthread_create will actually create a thread.
-- case "$host_os" in
-- solaris* | hpux*)
-- AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1,
-- [Define if the pthread_in_use() detection is hard.])
-- esac
-- ])
-- else
-- # Some library is needed. Try libpthread and libc_r.
-- AC_CHECK_LIB(pthread, pthread_kill,
-- [gl_have_pthread=yes
-- LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
-- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
-- if test -z "$gl_have_pthread"; then
-- # For FreeBSD 4.
-- AC_CHECK_LIB(c_r, pthread_kill,
-- [gl_have_pthread=yes
-- LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
-- LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
-- fi
-- fi
-- if test -n "$gl_have_pthread"; then
-- gl_threads_api=posix
-- AC_DEFINE([USE_POSIX_THREADS], 1,
-- [Define if the POSIX multithreading library can be used.])
-- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-- if test $gl_have_weak = yes; then
-- AC_DEFINE([USE_POSIX_THREADS_WEAK], 1,
-- [Define if references to the POSIX multithreading library should be made weak.])
-- LIBTHREAD=
-- LTLIBTHREAD=
-- fi
-- fi
-- # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
-- # pthread_rwlock_* functions.
-- AC_CHECK_TYPE([pthread_rwlock_t],
-- [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1,
-- [Define if the POSIX multithreading library has read/write locks.])],
-- [],
-- [#include <pthread.h>])
-- # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
-- AC_TRY_COMPILE([#include <pthread.h>],
-- [#if __FreeBSD__ == 4
--error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
--#else
--int x = (int)PTHREAD_MUTEX_RECURSIVE;
--return !x;
--#endif],
-- [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1,
-- [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
-- fi
-- fi
-- fi
-- if test -z "$gl_have_pthread"; then
-- if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
-- gl_have_solaristhread=
-- gl_save_LIBS="$LIBS"
-- LIBS="$LIBS -lthread"
-- AC_TRY_LINK([#include <thread.h>
--#include <synch.h>],
-- [thr_self();],
-- [gl_have_solaristhread=yes])
-- LIBS="$gl_save_LIBS"
-- if test -n "$gl_have_solaristhread"; then
-- gl_threads_api=solaris
-- LIBTHREAD=-lthread
-- LTLIBTHREAD=-lthread
-- LIBMULTITHREAD="$LIBTHREAD"
-- LTLIBMULTITHREAD="$LTLIBTHREAD"
-- AC_DEFINE([USE_SOLARIS_THREADS], 1,
-- [Define if the old Solaris multithreading library can be used.])
-- if test $gl_have_weak = yes; then
-- AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1,
-- [Define if references to the old Solaris multithreading library should be made weak.])
-- LIBTHREAD=
-- LTLIBTHREAD=
-- fi
-- fi
-- fi
-- fi
-- if test "$gl_use_threads" = pth; then
-- gl_save_CPPFLAGS="$CPPFLAGS"
-- AC_LIB_LINKFLAGS(pth)
-- gl_have_pth=
-- gl_save_LIBS="$LIBS"
-- LIBS="$LIBS -lpth"
-- AC_TRY_LINK([#include <pth.h>], [pth_self();], gl_have_pth=yes)
-- LIBS="$gl_save_LIBS"
-- if test -n "$gl_have_pth"; then
-- gl_threads_api=pth
-- LIBTHREAD="$LIBPTH"
-- LTLIBTHREAD="$LTLIBPTH"
-- LIBMULTITHREAD="$LIBTHREAD"
-- LTLIBMULTITHREAD="$LTLIBTHREAD"
-- AC_DEFINE([USE_PTH_THREADS], 1,
-- [Define if the GNU Pth multithreading library can be used.])
-- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-- if test $gl_have_weak = yes; then
-- AC_DEFINE([USE_PTH_THREADS_WEAK], 1,
-- [Define if references to the GNU Pth multithreading library should be made weak.])
-- LIBTHREAD=
-- LTLIBTHREAD=
-- fi
-- fi
-- else
-- CPPFLAGS="$gl_save_CPPFLAGS"
-- fi
-- fi
-- if test -z "$gl_have_pthread"; then
-- if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
-- if { case "$host_os" in
-- mingw*) true;;
-- *) false;;
-- esac
-- }; then
-- gl_threads_api=win32
-- AC_DEFINE([USE_WIN32_THREADS], 1,
-- [Define if the Win32 multithreading API can be used.])
-- fi
-- fi
-- fi
-- fi
-- AC_MSG_CHECKING([for multithread API to use])
-- AC_MSG_RESULT([$gl_threads_api])
-- AC_SUBST(LIBTHREAD)
-- AC_SUBST(LTLIBTHREAD)
-- AC_SUBST(LIBMULTITHREAD)
-- AC_SUBST(LTLIBMULTITHREAD)
--])
--
--AC_DEFUN([gl_LOCK],
--[
-- AC_REQUIRE([gl_LOCK_EARLY])
-- AC_REQUIRE([gl_LOCK_BODY])
-- gl_PREREQ_LOCK
--])
--
--# Prerequisites of lib/lock.c.
--AC_DEFUN([gl_PREREQ_LOCK], [
-- AC_REQUIRE([AC_C_INLINE])
--])
--
--dnl Survey of platforms:
--dnl
--dnl Platform Available Compiler Supports test-lock
--dnl flavours option weak result
--dnl --------------- --------- --------- -------- ---------
--dnl Linux 2.4/glibc posix -lpthread Y OK
--dnl
--dnl GNU Hurd/glibc posix
--dnl
--dnl FreeBSD 5.3 posix -lc_r Y
--dnl posix -lkse ? Y
--dnl posix -lpthread ? Y
--dnl posix -lthr Y
--dnl
--dnl FreeBSD 5.2 posix -lc_r Y
--dnl posix -lkse Y
--dnl posix -lthr Y
--dnl
--dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
--dnl
--dnl NetBSD 1.6 --
--dnl
--dnl OpenBSD 3.4 posix -lpthread Y OK
--dnl
--dnl MacOS X 10.[123] posix -lpthread Y OK
--dnl
--dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK
--dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK
--dnl
--dnl HP-UX 11 posix -lpthread N (cc) OK
--dnl Y (gcc)
--dnl
--dnl IRIX 6.5 posix -lpthread Y 0.5
--dnl
--dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
--dnl
--dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
--dnl -lpthread (gcc) Y
--dnl
--dnl Cygwin posix -lpthread Y OK
--dnl
--dnl Any of the above pth -lpth 0.0
--dnl
--dnl Mingw win32 N OK
--dnl
--dnl BeOS 5 --
--dnl
--dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
--dnl turned off:
--dnl OK if all three tests terminate OK,
--dnl 0.5 if the first test terminates OK but the second one loops endlessly,
--dnl 0.0 if the first test already loops endlessly.
diff --cc m4/printf-posix.m4
index af10170,af10170..0000000
deleted file mode 100644,100644
--- a/m4/printf-posix.m4
+++ /dev/null
@@@ -1,44 -1,44 +1,0 @@@
--# printf-posix.m4 serial 2 (gettext-0.13.1)
--dnl Copyright (C) 2003 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--dnl Test whether the printf() function supports POSIX/XSI format strings with
--dnl positions.
--
--AC_DEFUN([gt_PRINTF_POSIX],
--[
-- AC_REQUIRE([AC_PROG_CC])
-- AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
-- gt_cv_func_printf_posix,
-- [
-- AC_TRY_RUN([
--#include <stdio.h>
--#include <string.h>
--/* The string "%2$d %1$d", with dollar characters protected from the shell's
-- dollar expansion (possibly an autoconf bug). */
--static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
--static char buf[100];
--int main ()
--{
-- sprintf (buf, format, 33, 55);
-- return (strcmp (buf, "55 33") != 0);
--}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
-- [
-- AC_EGREP_CPP(notposix, [
--#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
-- notposix
--#endif
-- ], gt_cv_func_printf_posix="guessing no",
-- gt_cv_func_printf_posix="guessing yes")
-- ])
-- ])
-- case $gt_cv_func_printf_posix in
-- *yes)
-- AC_DEFINE(HAVE_POSIX_PRINTF, 1,
-- [Define if your printf() function supports format strings with positions.])
-- ;;
-- esac
--])
diff --cc m4/size_max.m4
index bfba811,bfba811..0000000
deleted file mode 100644,100644
--- a/m4/size_max.m4
+++ /dev/null
@@@ -1,62 -1,62 +1,0 @@@
--# size_max.m4 serial 5
--dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--AC_DEFUN([gl_SIZE_MAX],
--[
-- AC_CHECK_HEADERS(stdint.h)
-- dnl First test whether the system already has SIZE_MAX.
-- AC_MSG_CHECKING([for SIZE_MAX])
-- AC_CACHE_VAL([gl_cv_size_max], [
-- gl_cv_size_max=
-- AC_EGREP_CPP([Found it], [
--#include <limits.h>
--#if HAVE_STDINT_H
--#include <stdint.h>
--#endif
--#ifdef SIZE_MAX
--Found it
--#endif
--], gl_cv_size_max=yes)
-- if test -z "$gl_cv_size_max"; then
-- dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
-- dnl than the type 'unsigned long'. Try hard to find a definition that can
-- dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
-- _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1,
-- [#include <stddef.h>
--#include <limits.h>], size_t_bits_minus_1=)
-- _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
-- [#include <stddef.h>], fits_in_uint=)
-- if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
-- if test $fits_in_uint = 1; then
-- dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
-- dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
-- AC_TRY_COMPILE([#include <stddef.h>
-- extern size_t foo;
-- extern unsigned long foo;
-- ], [], fits_in_uint=0)
-- fi
-- dnl We cannot use 'expr' to simplify this expression, because 'expr'
-- dnl works only with 'long' integers in the host environment, while we
-- dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
-- if test $fits_in_uint = 1; then
-- gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
-- else
-- gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
-- fi
-- else
-- dnl Shouldn't happen, but who knows...
-- gl_cv_size_max='((size_t)~(size_t)0)'
-- fi
-- fi
-- ])
-- AC_MSG_RESULT([$gl_cv_size_max])
-- if test "$gl_cv_size_max" != yes; then
-- AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
-- [Define as the maximum value of type 'size_t', if the system doesn't define it.])
-- fi
--])
diff --cc m4/uintmax_t.m4
index bf83ed7,bf83ed7..0000000
deleted file mode 100644,100644
--- a/m4/uintmax_t.m4
+++ /dev/null
@@@ -1,30 -1,30 +1,0 @@@
--# uintmax_t.m4 serial 9
--dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Paul Eggert.
--
--AC_PREREQ(2.13)
--
--# Define uintmax_t to 'unsigned long' or 'unsigned long long'
--# if it is not already defined in <stdint.h> or <inttypes.h>.
--
--AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
--[
-- AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-- AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-- if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
-- AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
-- test $ac_cv_type_unsigned_long_long = yes \
-- && ac_type='unsigned long long' \
-- || ac_type='unsigned long'
-- AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-- [Define to unsigned long or unsigned long long
-- if <stdint.h> and <inttypes.h> don't define.])
-- else
-- AC_DEFINE(HAVE_UINTMAX_T, 1,
-- [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
-- fi
--])
diff --cc m4/wint_t.m4
index b8fff9c,b8fff9c..0000000
deleted file mode 100644,100644
--- a/m4/wint_t.m4
+++ /dev/null
@@@ -1,20 -1,20 +1,0 @@@
--# wint_t.m4 serial 1 (gettext-0.12)
--dnl Copyright (C) 2003 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--dnl Test whether <wchar.h> has the 'wint_t' type.
--dnl Prerequisite: AC_PROG_CC
--
--AC_DEFUN([gt_TYPE_WINT_T],
--[
-- AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
-- [AC_TRY_COMPILE([#include <wchar.h>
-- wint_t foo = (wchar_t)'\0';], ,
-- gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
-- if test $gt_cv_c_wint_t = yes; then
-- AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
-- fi
--])
diff --cc po/Makefile.in.in
index eb68ea2,eb68ea2..0000000
deleted file mode 100644,100644
--- a/po/Makefile.in.in
+++ /dev/null
@@@ -1,429 -1,429 +1,0 @@@
--# Makefile for PO directory in any package using GNU gettext.
--# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
--#
--# This file can be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU General Public
--# License but which still want to provide support for the GNU gettext
--# functionality.
--# Please note that the actual code of GNU gettext is covered by the GNU
--# General Public License and is *not* in the public domain.
--#
--# Origin: gettext-0.17
--GETTEXT_MACRO_VERSION = 0.17
--
--PACKAGE = @PACKAGE@
--VERSION = @VERSION@
--PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
--
--SHELL = /bin/sh
-- at SET_MAKE@
--
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
--VPATH = @srcdir@
--
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--datarootdir = @datarootdir@
--datadir = @datadir@
--localedir = @localedir@
--gettextsrcdir = $(datadir)/gettext/po
--
--INSTALL = @INSTALL@
--INSTALL_DATA = @INSTALL_DATA@
--
--# We use $(mkdir_p).
--# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
--# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
--# @install_sh@ does not start with $(SHELL), so we add it.
--# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
--# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
--# versions, $(mkinstalldirs) and $(install_sh) are unused.
--mkinstalldirs = $(SHELL) @install_sh@ -d
--install_sh = $(SHELL) @install_sh@
--MKDIR_P = @MKDIR_P@
--mkdir_p = @mkdir_p@
--
--GMSGFMT_ = @GMSGFMT@
--GMSGFMT_no = @GMSGFMT@
--GMSGFMT_yes = @GMSGFMT_015@
--GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
--MSGFMT_ = @MSGFMT@
--MSGFMT_no = @MSGFMT@
--MSGFMT_yes = @MSGFMT_015@
--MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
--XGETTEXT_ = @XGETTEXT@
--XGETTEXT_no = @XGETTEXT@
--XGETTEXT_yes = @XGETTEXT_015@
--XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
--MSGMERGE = msgmerge --previous
--MSGMERGE_UPDATE = @MSGMERGE@ --previous --update
--MSGINIT = msginit
--MSGCONV = msgconv
--MSGFILTER = msgfilter
--
--POFILES = @POFILES@
--GMOFILES = @GMOFILES@
--UPDATEPOFILES = @UPDATEPOFILES@
--DUMMYPOFILES = @DUMMYPOFILES@
--DISTFILES.common = Makefile.in.in remove-potcdate.sin \
--$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
--DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
--$(POFILES) $(GMOFILES) \
--$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
--
--POTFILES = \
--
--CATALOGS = @CATALOGS@
--
--# Makevars gets inserted here. (Don't remove this line!)
--
--.SUFFIXES:
--.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
--
--.po.mo:
-- @echo "$(MSGFMT) -c -o $@ $<"; \
-- $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
--
--.po.gmo:
-- @lang=`echo $* | sed -e 's,.*/,,'`; \
-- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
--
--.sin.sed:
-- sed -e '/^#/d' $< > t-$@
-- mv t-$@ $@
--
--
--all: check-macro-version all- at USE_NLS@
--
--all-yes: stamp-po
--all-no:
--
--# Ensure that the gettext macros and this Makefile.in.in are in sync.
--check-macro-version:
-- @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
-- || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
-- exit 1; \
-- }
--
--# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
--# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
--# we don't want to bother translators with empty POT files). We assume that
--# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
--# In this case, stamp-po is a nop (i.e. a phony target).
--
--# stamp-po is a timestamp denoting the last time at which the CATALOGS have
--# been loosely updated. Its purpose is that when a developer or translator
--# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
--# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
--# invocations of "make" will do nothing. This timestamp would not be necessary
--# if updating the $(CATALOGS) would always touch them; however, the rule for
--# $(POFILES) has been designed to not touch files that don't need to be
--# changed.
--stamp-po: $(srcdir)/$(DOMAIN).pot
-- test ! -f $(srcdir)/$(DOMAIN).pot || \
-- test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
-- @test ! -f $(srcdir)/$(DOMAIN).pot || { \
-- echo "touch stamp-po" && \
-- echo timestamp > stamp-poT && \
-- mv stamp-poT stamp-po; \
-- }
--
--# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
--# otherwise packages like GCC can not be built if only parts of the source
--# have been downloaded.
--
--# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
--# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
--$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-- if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
-- package_gnu='GNU '; \
-- else \
-- package_gnu=''; \
-- fi; \
-- if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
-- msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
-- else \
-- msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
-- fi; \
-- case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
-- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
-- --files-from=$(srcdir)/POTFILES.in \
-- --copyright-holder='$(COPYRIGHT_HOLDER)' \
-- --msgid-bugs-address="$$msgid_bugs_address" \
-- ;; \
-- *) \
-- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
-- --files-from=$(srcdir)/POTFILES.in \
-- --copyright-holder='$(COPYRIGHT_HOLDER)' \
-- --package-name="$${package_gnu}@PACKAGE@" \
-- --package-version='@VERSION@' \
-- --msgid-bugs-address="$$msgid_bugs_address" \
-- ;; \
-- esac
-- test ! -f $(DOMAIN).po || { \
-- if test -f $(srcdir)/$(DOMAIN).pot; then \
-- sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-- sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-- if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-- rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-- else \
-- rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-- mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-- fi; \
-- else \
-- mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-- fi; \
-- }
--
--# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
--# every "make" invocation, only create it when it is missing.
--# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
--$(srcdir)/$(DOMAIN).pot:
-- $(MAKE) $(DOMAIN).pot-update
--
--# This target rebuilds a PO file if $(DOMAIN).pot has changed.
--# Note that a PO file is not touched if it doesn't need to be changed.
--$(POFILES): $(srcdir)/$(DOMAIN).pot
-- @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-- if test -f "$(srcdir)/$${lang}.po"; then \
-- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
-- else \
-- $(MAKE) $${lang}.po-create; \
-- fi
--
--
--install: install-exec install-data
--install-exec:
--install-data: install-data- at USE_NLS@
-- if test "$(PACKAGE)" = "gettext-tools"; then \
-- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-- for file in $(DISTFILES.common) Makevars.template; do \
-- $(INSTALL_DATA) $(srcdir)/$$file \
-- $(DESTDIR)$(gettextsrcdir)/$$file; \
-- done; \
-- for file in Makevars; do \
-- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-- done; \
-- else \
-- : ; \
-- fi
--install-data-no: all
--install-data-yes: all
-- $(mkdir_p) $(DESTDIR)$(datadir)
-- @catalogs='$(CATALOGS)'; \
-- for cat in $$catalogs; do \
-- cat=`basename $$cat`; \
-- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-- dir=$(localedir)/$$lang/LC_MESSAGES; \
-- $(mkdir_p) $(DESTDIR)$$dir; \
-- if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
-- $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-- echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-- for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-- if test -n "$$lc"; then \
-- if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-- link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-- mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-- (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-- for file in *; do \
-- if test -f $$file; then \
-- ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-- fi; \
-- done); \
-- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-- else \
-- if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-- :; \
-- else \
-- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-- fi; \
-- fi; \
-- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-- ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-- ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-- cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-- echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
-- fi; \
-- done; \
-- done
--
--install-strip: install
--
--installdirs: installdirs-exec installdirs-data
--installdirs-exec:
--installdirs-data: installdirs-data- at USE_NLS@
-- if test "$(PACKAGE)" = "gettext-tools"; then \
-- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-- else \
-- : ; \
-- fi
--installdirs-data-no:
--installdirs-data-yes:
-- $(mkdir_p) $(DESTDIR)$(datadir)
-- @catalogs='$(CATALOGS)'; \
-- for cat in $$catalogs; do \
-- cat=`basename $$cat`; \
-- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-- dir=$(localedir)/$$lang/LC_MESSAGES; \
-- $(mkdir_p) $(DESTDIR)$$dir; \
-- for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-- if test -n "$$lc"; then \
-- if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-- link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-- mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-- (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-- for file in *; do \
-- if test -f $$file; then \
-- ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-- fi; \
-- done); \
-- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-- else \
-- if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-- :; \
-- else \
-- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-- mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-- fi; \
-- fi; \
-- fi; \
-- done; \
-- done
--
--# Define this as empty until I found a useful application.
--installcheck:
--
--uninstall: uninstall-exec uninstall-data
--uninstall-exec:
--uninstall-data: uninstall-data- at USE_NLS@
-- if test "$(PACKAGE)" = "gettext-tools"; then \
-- for file in $(DISTFILES.common) Makevars.template; do \
-- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-- done; \
-- else \
-- : ; \
-- fi
--uninstall-data-no:
--uninstall-data-yes:
-- catalogs='$(CATALOGS)'; \
-- for cat in $$catalogs; do \
-- cat=`basename $$cat`; \
-- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-- for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
-- rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-- done; \
-- done
--
--check: all
--
--info dvi ps pdf html tags TAGS ctags CTAGS ID:
--
--mostlyclean:
-- rm -f remove-potcdate.sed
-- rm -f stamp-poT
-- rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
-- rm -fr *.o
--
--clean: mostlyclean
--
--distclean: clean
-- rm -f Makefile Makefile.in POTFILES *.mo
--
--maintainer-clean: distclean
-- @echo "This command is intended for maintainers to use;"
-- @echo "it deletes files that may require special tools to rebuild."
-- rm -f stamp-po $(GMOFILES)
--
--distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
--dist distdir:
-- $(MAKE) update-po
-- @$(MAKE) dist2
--# This is a separate target because 'update-po' must be executed before.
--dist2: stamp-po $(DISTFILES)
-- dists="$(DISTFILES)"; \
-- if test "$(PACKAGE)" = "gettext-tools"; then \
-- dists="$$dists Makevars.template"; \
-- fi; \
-- if test -f $(srcdir)/$(DOMAIN).pot; then \
-- dists="$$dists $(DOMAIN).pot stamp-po"; \
-- fi; \
-- if test -f $(srcdir)/ChangeLog; then \
-- dists="$$dists ChangeLog"; \
-- fi; \
-- for i in 0 1 2 3 4 5 6 7 8 9; do \
-- if test -f $(srcdir)/ChangeLog.$$i; then \
-- dists="$$dists ChangeLog.$$i"; \
-- fi; \
-- done; \
-- if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-- for file in $$dists; do \
-- if test -f $$file; then \
-- cp -p $$file $(distdir) || exit 1; \
-- else \
-- cp -p $(srcdir)/$$file $(distdir) || exit 1; \
-- fi; \
-- done
--
--update-po: Makefile
-- $(MAKE) $(DOMAIN).pot-update
-- test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
-- $(MAKE) update-gmo
--
--# General rule for creating PO files.
--
--.nop.po-create:
-- @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
-- echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
-- exit 1
--
--# General rule for updating PO files.
--
--.nop.po-update:
-- @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-- if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
-- tmpdir=`pwd`; \
-- echo "$$lang:"; \
-- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-- cd $(srcdir); \
-- if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
-- if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-- rm -f $$tmpdir/$$lang.new.po; \
-- else \
-- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-- :; \
-- else \
-- echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-- exit 1; \
-- fi; \
-- fi; \
-- else \
-- echo "msgmerge for $$lang.po failed!" 1>&2; \
-- rm -f $$tmpdir/$$lang.new.po; \
-- fi
--
--$(DUMMYPOFILES):
--
--update-gmo: Makefile $(GMOFILES)
-- @:
--
--Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
-- cd $(top_builddir) \
-- && $(SHELL) ./config.status $(subdir)/$@.in po-directories
--
--force:
--
--# Tell versions [3.59,3.63) of GNU make not to export all variables.
--# Otherwise a system limit (for SysV at least) may be exceeded.
--.NOEXPORT:
diff --cc po/ca.po
index ecc7fbf,0a64bc4..ece09b3
--- a/po/ca.po
+++ b/po/ca.po
@@@ -27,7 -27,6 +27,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi at gnu.org>\n"
"Language-Team: Catalan <ca at dodds.net>\n"
@@@ -120,8 -104,6 +120,8 @@@ msgstr "Introduïu la contrasenya; aque
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "la contrasenya és errònia"
@@@ -177,25 -148,11 +177,25 @@@ msgstr "la contrasenya és errònia
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -407,8 -325,6 +407,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "canvia la contrasenya"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -418,116 -334,86 +418,116 @@@ msgstr "
"Opcions:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 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:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detall"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "una mica més silenciós"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca claus en un servidor de claus"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualitza la base de dades de confiança"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NOM|el joc de caràcters serà NOM"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
# Gènere? Nombre? ivb
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
@@@ -536,7 -422,6 +536,7 @@@ msgstr "no és suportat
# Gènere? Nombre? ivb
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -545,164 -430,124 +545,169 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: s'ha creat el directori\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
+
++#: agent/gpg-agent.c:1964
#, 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:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claus es descarta\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -718,8 -561,6 +723,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -727,9 -568,6 +732,9 @@@ msgstr "
"@Ordres:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -739,46 -577,38 +744,46 @@@ msgstr "
"Opcions:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "Cancel·la"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
@@@ -843,8 -663,6 +848,8 @@@ msgstr "
msgid "Yes"
msgstr "sí|si"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -874,46 -689,38 +879,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "canvia la contrasenya"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Realment voleu eliminar les claus seleccionades? "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "activa una clau"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -955,53 -755,42 +960,57 @@@ msgstr "l'algoritme de protecció %d%s
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "error en la lectura de «%s»: %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "ha fallat l'actualització: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -1016,18 -803,19 +1025,23 @@@ msgstr "hi ha un problema de comunicaci
msgid "problem setting the gpg-agent options\n"
msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "s'ha cancel·lat per l'usuari\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
+
# bolcats de memòria? ivb
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
@@@ -1100,17 -874,18 +1114,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, fuzzy, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "error en crear l'anell «%s»: %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1461,7 -1169,6 +1480,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 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "no forçat"
@@@ -1471,22 -1177,14 +1490,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "opcions d'importació no vàlides\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "heu trobat un bug... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "no es pot obrir el fitxer: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
@@@ -1525,92 -1216,78 +1539,98 @@@ msgstr "no s'ha trobat la clau públic
msgid "waiting for lock %s...\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "la capçalera d'armadura és invàlida: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "capçalera d'armadura: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "la capçalera de signatura clara és invàlida\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "capçalera d'armadura: "
# És un missatge d'error? ivb
# «Anidada» és un castellanisme. Niuades? Imbricades (SC)?? ivb
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "signatures en text pla imbricades\n"
# FIXME: un-indiar. jm
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "armadura inesperada:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "la línia escapada amb guió és invàlida: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "fi de fitxer prematur (no CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "fi de fitxer prematur (en CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "CRC malformat\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "error de CRC; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "fí de fitxer prematur (al final)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "error en l'última línia\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "no s'han trobat dades OpenPGP vàlides.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
"utilitzat un MTA amb errors\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "no llegible per humans"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1618,89 -1295,78 +1638,100 @@@ msgstr "
"un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
"amb el signe «=»\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "un valor de notació no pot utilitzar cap caràcter de control\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
+ "amb el signe «=»\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "no llegible per humans"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, fuzzy, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "no s'ha pogut posar «%s» en la base de dades de confiança - %s\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Introduïu la contrasenya: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
# FIXME: preferència? jm
# Ho discutírem en la llista, segur. Deu ser als arxius. ivb
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "no es pot fet això en mode desatès\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
# Parts? Peces? ivb
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "La vostra selecció? "
@@@ -1767,21 -1419,11 +1798,16 @@@ msgstr "no hi ha cap clau pública corr
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
@@@ -1879,13 -1502,10 +1905,13 @@@ msgstr "Quina grandària voleu? (1024)
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: 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:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1939,9 -1549,6 +1965,9 @@@ msgstr " (%d) RSA (només xifrar)\n
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "La selecció és invàlida.\n"
@@@ -1975,7 -1576,6 +2001,7 @@@ msgstr "Signar realment?
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "ix del menú"
@@@ -1986,7 -1585,6 +2012,7 @@@ msgstr "les ordres entren en conflicte\
# «pantalla» o «ajuda»? ivb
# «ajuda», evidentment. jm
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "mostra aquesta ajuda"
@@@ -2068,134 -1648,104 +2094,134 @@@ msgstr "
msgid "Admin commands are not allowed\n"
msgstr ""
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "L'ordre no és vàlida (proveu «help»)\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "no s'ha pogut obrir «%s»\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
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:136
++#: g10/delkey.c:135
#, 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:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Voleu esborrar aquesta clau de l'anell? "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "És una clau secreta! Voleu esborrar-la? "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, 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:198
++#: g10/delkey.c:197
msgid "key"
msgstr "clau"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Clau pública: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "s'ha netejat la informació de la confiança\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "«%s» ja està comprimida\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVÍS: «%s» és un fitxer buit\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "s'està llegint des de «%s»\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2204,42 -1754,35 +2230,42 @@@ msgstr "
"forçar l'algoritme de compressió %s (%d) viola les preferències del "
"destinatari\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "no podeu usar %s mentre esteu en mode %s\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s xifrat per a: «%s»\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "no podeu usar %s mentre esteu en mode %s\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "dades xifrades amb %s\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "xifrat amb l'algoritme %d (desconegut)\n"
# És no-wrap? ivb
# Com? jm
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
"simètric.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problema en tractar amb un paquet xifrat\n"
@@@ -2302,141 -1834,113 +2328,141 @@@ 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:79
++#: g10/export.c:78
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"La signatura es marcarà com a irrevocable.\n"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "la clau secreta és inusable"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: es descarta: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "AVÍS: no s'ha exportat res\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[No s'ha trobat l'id d'usuari]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "Empremta digital:"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, 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:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "|[fitxer]|crea una signatura"
@@@ -2446,11 -1949,9 +2472,11 @@@
msgid "make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "crea una signatura separada"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "xifra dades"
@@@ -2458,15 -1958,12 +2484,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "xifra només amb xifratge simètric"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "desxifra dades (predeterminat)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifica una signatura"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "llista claus"
@@@ -2481,15 -1976,12 +2507,15 @@@ msgid "list and check key signatures
msgstr "comprova les signatures de la claus"
# «dactilars» o «digitals»? ivb
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "llista claus i empremtes digitals"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "llista claus secretes"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genera un nou parell de claus"
@@@ -2513,7 -2001,6 +2539,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "genera un certificat de revocació"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "elimina claus de l'anell públic"
@@@ -2545,7 -2026,6 +2571,7 @@@ msgstr "signa una clau localment
msgid "sign or edit a key"
msgstr "signa o edita una clau"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "canvia la contrasenya"
@@@ -2595,24 -2064,19 +2621,24 @@@ msgstr "actualitza la base de dades de
msgid "print message digests"
msgstr "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crea eixida amb armadura ascii"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOM|xifra per a NOM"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa aquest id per a signar o desxifrar"
@@@ -2626,12 -2088,10 +2652,12 @@@ msgstr "|N|nivell de compressió N (0 n
msgid "use canonical text mode"
msgstr "usa el mode de text canònic"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "no fa cap canvi"
@@@ -2643,7 -2101,6 +2669,7 @@@ msgstr "pregunta abans de sobreescriure
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2654,7 -2111,6 +2680,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:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2674,13 -2130,11 +2700,13 @@@ msgstr "
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2700,7 -2154,6 +2726,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:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2708,608 -2161,479 +2734,608 @@@ msgstr "
"\n"
"Algoritmes suportats:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Clau pública: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Xifratge: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Dispersió: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Compressió: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "forma d'ús: gpg [opcions] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, 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:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, 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:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, 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:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra en quin anell de claus està una clau llistada"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "desactiva una clau"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, 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:2994
++#: g10/gpg.c:3001
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, 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:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, 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:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, 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:3265
++#: g10/gpg.c:3272
#, 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:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
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:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s no és permés amb %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s no té sentit amb %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no és vàlid\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ha de ser major que 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ha de ser major que 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
#, 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:3517
++#: g10/gpg.c:3524
#, 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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "les preferències per defecte són invàlides\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "les preferències personals de xifrat són invàlides\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "les preferències personals de digest són invàlides\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "les preferències personals de compressió són invàlides\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, 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:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [nom_del_fitxer]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [nom_del_fitxer]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [nom_del_fitxer]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom_del_fitxer]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [nom_del_fitxer]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [nom_del_fitxer]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [ordres]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ha fallat la cerca al servidor de claus: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "ha fallat el refresc des del servidor de claus: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "no s'ha pogut llevar l'armadura: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, 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:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[nom_del_fitxer]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Endavant, escriviu el missatge...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
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:4942
++#: g10/gpg.c:4949
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:4975
++#: g10/gpg.c:4982
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
@@@ -3323,7 -2645,6 +3349,7 @@@ msgstr "pren les claus d'aquest anell
msgid "make timestamp conflicts only a warning"
msgstr "fes els conflictes de marques de temps només un avís"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|escriu informació d'estat en aquest FD"
@@@ -3351,326 -2668,260 +3377,326 @@@ msgstr "No hi ha ajuda disponible
msgid "No help available for '%s'"
msgstr "No hi ha ajuda disponible per a `%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualitza la base de dades de confiança"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualitza la base de dades de confiança"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "la clau secreta és inusable"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "es descarta un bloc de tipus %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "fins ara s'han processat %lu claus\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Nombre total processat: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " claus noves descartades: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " claus noves descartades: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sense ID: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importades: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " no modificades: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID d'usuaris nous: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subclaus noves: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " signatures noves: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " noves revocacions: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claus privades llegides: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "claus privades importades: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claus privades no canviades: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " importades: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signatures noves: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " claus privades llegides: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "es descarta «%s»: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clau %08lX: l'ID no és vàlid\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "clau %08lX: clau nova - es descarta \n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "no s'ha trobat cap anell escrivible: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, 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:1135
++#: g10/import.c:1134
#, 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:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, 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:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clau %08lX: «%s» 1 signatura nova\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clau %08lX: «%s» 1 subclau nova\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clau %08lX: «%s» %d subclaus noves\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, 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:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clau %08lX: «%s» no ha estat modificada\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "clau %08lX: s'ha importat la clau secreta\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3685,12 -2936,10 +3711,12 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
@@@ -3700,22 -2949,18 +3726,22 @@@
# O «rebutjara»? ivb
# Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
# «es rebutja» està bé. jm
- #: g10/import.c:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, 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:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
@@@ -3723,174 -2968,158 +3749,194 @@@
"«%s»\n"
"\n"
- #: g10/import.c:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, 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:2044
++#: g10/import.c:2043
#, 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:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, 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:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clau %08lX: Subclau de revocació no vàlida\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, 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:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clau %08lX: es descarta l'ID d'usuari '"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "clau %08lX: es descarta la subclau\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, 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:2596
++#: g10/import.c:2595
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "s'ha creat l'anell «%s»\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "s'ha creat l'anell «%s»\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, 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:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revocació]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[autosignatura]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d signatures errònies\n"
- msgstr[1] "%d signatures errònies\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "signatura %s, algorisme de resum %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "Signatura correcta de \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "es descarta «%s»: %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "L'ID d'usuari «%s» està revocat."
+ msgstr[1] "L'ID d'usuari «%s» està revocat."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3898,23 -3127,25 +3944,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signatura no comprovada per falta de clau\n"
msgstr[1] "1 signatura no comprovada per falta de clau\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 signatura no comprovada a causa d'un error\n"
- msgstr[1] "1 signatura no comprovada a causa d'un error\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d signatures errònies\n"
+ msgstr[1] "%d signatures errònies\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "Han estat detectats %d IDs sense autosignatura vàlida\n"
- msgstr[1] "Han estat detectats %d IDs sense autosignatura vàlida\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Signatura correcta de \""
+ msgstr[1] "Signatura correcta de \""
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3926,70 -3157,55 +3978,70 @@@ msgstr "
"verificar les claus d'altres usuaris (mirant passaports,\n"
"comprovant empremtes de diferents fonts...)?\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Hi confie marginalment\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Hi confie plenament\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " No es pot signar.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'ID d'usuari «%s» ha caducat."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'ID d'usuari «%s» no està autosignat."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'ID d'usuari «%s» no està autosignat."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Signar realment? "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3998,11 -3214,9 +4050,11 @@@ msgstr "
"La vostra signatura en «%s»\n"
"és una signatura d'estil PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4011,11 -3225,9 +4063,11 @@@ msgstr "
"La vostra signatura actual en «%s»\n"
"ha caducat.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4024,43 -3236,34 +4076,43 @@@ msgstr "
"La vostra signatura en «%s»\n"
"és una signatura local.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, 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:833
++#: g10/keyedit.c:1346
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:855
++#: g10/keyedit.c:1368
#, 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:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "La clau ha caducat!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Aquesta clau caducarà el %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4070,32 -3273,26 +4122,32 @@@ msgstr "
"pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
"contestar, entreu «0».\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) No vaig a contestar.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, 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:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) He fet algunes comprovacions.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) He fet comprovacions molt acurades.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4104,142 -3301,113 +4156,138 @@@ msgstr "
"Esteu segur que voleu signar aquesta clau\n"
"amb la vostra clau: \""
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Açò serà una autosignatura.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, 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:1010
++#: g10/keyedit.c:1523
#, 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:1020
++#: g10/keyedit.c:1533
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La signatura es marcarà com a inexportable.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La signatura es marcarà com a irrevocable.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"No he comprovat aquesta clau en absolut.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"He fet algunes comprovacions a aquesta clau.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"He comprovat aquesta clau amb molta cura.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Signar realment? "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "s'està posant la signatura al lloc correcte\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "desa i ix"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra empremta"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Notació de signatura: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
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:1392
++#: g10/keyedit.c:1857
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:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "tria l'ID d'usuari N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "revoca signatures"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "signa la clau localment"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "afegeix un ID d'usuari"
@@@ -4247,139 -3415,110 +4295,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:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "afegeix un photo ID"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "esborra un ID d'usuari"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "esborra una clau secundària"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "afegeix una clau de revocació"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, 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:1430
++#: g10/keyedit.c:1896
#, 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:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marca l'ID d'usuari com a primari"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "llista les preferències (expert)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "llista les preferències (detallat)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, 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:1441
++#: g10/keyedit.c:1907
#, 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:1443
++#: g10/keyedit.c:1909
#, 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:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "canvia la contrasenya"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "canvia la confiança"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revoca un ID d'usuari"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoca una clau secundària"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "activa una clau"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "desactiva una clau"
# Igual que dalt. ivb
# Idem :) jm
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostra el photo ID"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "La clau secreta està disponible.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Cal la clau secreta per a fer açò.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4387,272 -3526,220 +4435,278 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "La clau està revocada."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Realment voleu signar tots els ID d'usuari? "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Realment voleu signar tots els ID d'usuari? "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "la classe de signatura és desconeguda"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "No podeu esborrar l'últim ID d'usuari!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Heu de seleccionar, si més no, una clau.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Heu de seleccionar, si més no, una clau.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Realment voleu eliminar les claus seleccionades? "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Realment voleu eliminar aquesta clau? "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Realment voleu eliminar aquest ID d'usuari? "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Realment voleu revocar aquesta clau? "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Realment voleu revocar les claus seleccionades? "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Realment voleu revocar aquesta clau? "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "estableix la llista de preferències"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, 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:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Realment voleu actualitzar les preferències? "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Voleu desar els canvis? "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Voleu eixir sense desar? "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "La clau no ha canviat, per tant no cal actualització.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, 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:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "el valor no és vàlid\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Usuari inexistent.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "No hi ha res que signar amb la clau %08lX\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Resum: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Funcionalitats: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Notació: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr " (sensible)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "no s'ha pogut creat %s: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocada]"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr ""
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confiança: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Aquesta clau ha estat desactivada"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4660,19 -3747,14 +4714,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revocada]"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4681,18 -3763,15 +4735,18 @@@ msgstr "
" causar que una ID d'usuari diferent esdevinga en la primària "
"assumida.\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4701,38 -3780,30 +4755,38 @@@ msgstr "
"AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
"algunes versions de PGP rebutgen aquesta clau.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
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:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
# Werner FIXME: use ngettext. jm
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4740,37 -3811,30 +4794,37 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "S'ha esborrat %d signatura.\n"
msgstr[1] "S'ha esborrat %d signatura.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "No s'hi ha eliminat res.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "invàlida"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "L'ID d'usuari «%s» està revocat."
msgstr[1] "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4779,41 -3843,33 +4833,41 @@@ msgstr "
"AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
"fer que algunes versions de PGP rebutjen aquesta clau.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduïu l'ID d'usuari del revocador designat: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
#, 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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
#, 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:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4821,240 -3877,190 +4875,240 @@@
msgstr ""
"Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, 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:4026
++#: g10/keyedit.c:4544
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:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Heu de seleccionar exactament un ID.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Notació de signatura: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Voleu sobreescriure? (s/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, 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:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID d'usuari: «"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (no-exportable)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aquesta signatura va caducar el %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
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:5178
++#: g10/keyedit.c:5802
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:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr " (no-exportable)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocat per %08lX el %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Esteu a punt de revocar aquestes signatures:\n"
# (s/N)? ivb
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realment voleu crear els certificats de revocació? (s/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "ho hi ha clau secreta\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "la preferència %c%lu és duplicada\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "hi ha massa preferències «%c»\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "hi ha massa preferències «%c»\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "hi ha massa preferències «%c»\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "s'està escrivint una signatura directa\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "s'està escrivint l'autosignatura\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "s'està escrivint la signatura de comprovació de la clau\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, 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:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "xifra dades"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -5068,157 -4074,126 +5122,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr ""
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Seleccioneu quin tipus de clau voleu:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA i ElGamal (predeterminat)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA i ElGamal (predeterminat)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (només signar)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (només signar)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (només xifrar)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (només signar)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA i ElGamal (predeterminat)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (només signar)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (només signar)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notació de signatura: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La grandària sol·licitada és %u bits\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "arrodonida fins a %u bits\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Seleccioneu quin tipus de clau voleu:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5234,7 -4209,6 +5288,7 @@@ msgstr "
" <n>m = la clau caduca als n mesos\n"
" <n>y = la clau caduca als n anys\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5250,42 -4224,34 +5304,42 @@@ msgstr "
" <n>m = la signatura caduca als n mesos\n"
" <n>y = la signatura caduca als n anys\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Indiqueu la validesa de la clau (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Indiqueu la validesa de la signatura (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "el valor no és vàlid\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s no caduca en absolut\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s no caduca en absolut\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s caduca el %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Aquesta signatura caduca el %s\n"
# Amb «it» es refereix a les dates? ivb
# Això vaig entendre jo. jm
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5293,12 -4259,10 +5347,12 @@@ msgstr "
"El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
"Tanmateix, les tractarà bé fins l'any 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "És correcte? (s/n)"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5309,7 -4273,6 +5363,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5326,50 -4289,39 +5380,50 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Nom i cognoms: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "El nom no pot començar amb un dígit\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
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:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Adreça electrònica: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "No és una adreça vàlida\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Comentari: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5380,7 -4332,6 +5434,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5397,35 -4348,28 +5451,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoXx"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Corregiu l'error primer\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5437,12 -4381,10 +5491,12 @@@ msgstr "
"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
"d'aconseguir prou entropia.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5450,69 -4392,56 +5504,69 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "«%s» ja està comprimida\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Voleu crear la clau de tota manera? "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Voleu crear la clau de tota manera? "
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "La generació de claus ha estat cancel·lada.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr ""
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, 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:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
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:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5522,7 -4451,6 +5576,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:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5531,7 -4459,6 +5585,7 @@@ msgstr "
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5539,51 -4466,40 +5593,51 @@@ msgstr "
"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
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:4298
++#: g10/keygen.c:4324
#, 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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realment? "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "mai "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Política de signatura crítica: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Política de signatura: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Notació de signatura crítica: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Notació de signatura: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5591,62 -4507,57 +5645,70 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d signatures errònies\n"
msgstr[1] "%d signatures errònies\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 signatura no comprovada a causa d'un error\n"
+ msgstr[1] "1 signatura no comprovada a causa d'un error\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Anell"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "es descarta «%s»: %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Empremtes digital de la clau primària:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Empremta digital de la clau primària:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " Empremta digital ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "s'està comprovant l'anell «%s»\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "s'han comprovat %lu claus (%lu signatures)\n"
msgstr[1] "s'han comprovat %lu claus (%lu signatures)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5654,7 -4565,6 +5716,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu clau actualitzades\n"
msgstr[1] "\t%lu clau actualitzades\n"
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5664,423 -4574,337 +5726,423 @@@ msgstr[1] "1 signatura errònia\n
# Fitxer indi fins final. Hau! ivb
# Grrr. Com em tracten els esclaus ja... jm
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: s'ha creat l'anell\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, 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:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: no és un ID vàlid\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "s'està sol·licitant la clau %08lX de %s\n"
msgstr[1] "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
# «del servidor», «en el servidor»? ivb
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "error de servidor de claus"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "clau de sessió xifrada amb %s\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "xifrat amb l'algoritme %d (desconegut)\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "la clau pública és %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr ""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "xifrat amb una clau %s, ID %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "xifrat amb %lu contrasenyes\n"
# FIXME WK: Use ngettext
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "xifrat amb 1 contrasenya\n"
# I no serà «dades xifrades amb %s»? ivb
# Sembla que sí, ho marque per a mirar-ho més endavant. jm
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "s'assumeixen dades xifrades amb %s\n"
# L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé! ivb
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
"en el seu lloc\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "desxifratge correcte\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nom del fitxer original='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "Signatura correcta de \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Signatura INCORRECTA de \""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signatura caducada de \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signatura correcta de \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "s'ha eliminat la verificació de signatura\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "no es poden tractar aquestes signatures múltiples\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
# «%.*s» no serà una data? Caldrà «el» al davant. ivb
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "La clau és disponible en: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[incert]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Aquesta signatura caduca el %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binari"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "mode text"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "desconeguda"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "l'algoritme de clau pública és desconegut"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "No s'ha pogut comprovar la signatura: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "no és una signatura separada\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signatura autònoma de classe 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "signatura de l'estil antic (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, 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:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "l'algoritme de xifratge no és implementat"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "error de lectura: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "error de lectura: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, fuzzy, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -6089,7 -4913,6 +6151,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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "No comprimit"
@@@ -6097,100 -4920,81 +6159,100 @@@
# 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:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "No comprimit"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "la classe de signatura és desconeguda"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "El fitxer «%s» existeix. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Voleu sobreescriure? (s/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: el sufix és desconegut\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Introduïu el nou nom del fitxer"
# Indi? ivb
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "s'està escrivint en stdout\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "s'asumeix que hi ha dades signades en «%s»\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr ""
"AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquet de tipus %d té el bit crític activat\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID de la clau principal %08lX)"
@@@ -6206,7 -5010,6 +6268,7 @@@
# Se't passava l'argument «*». printf(3), hieroglyph(7). ivb
# Ah! Prova-ho, no casque alguna cosa :P ivb
# Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6219,15 -5022,12 +6281,15 @@@ msgstr "
"«%2$.*1$s»\n"
"clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Introduïu la contrasenya\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "s'ha cancel·lat per l'usuari\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6237,47 -5037,38 +6299,47 @@@ msgstr "
"Necessiteu la contrasenya per desblocar la clau secreta de\n"
"l'usuari: \""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Realment voleu eliminar les claus seleccionades? "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Realment voleu eliminar les claus seleccionades? "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6334,31 -5117,24 +6396,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "No s'ha especificat cap raó"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "La clau ha estat substituïda"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "La clau ha estat compromesa"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "La clau ja no s'usa"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "L'ID d'usuari ja no és vàlid"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "raó de la revocació: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "comentari de la revocació: "
@@@ -6372,101 -5148,82 +6434,101 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMxXoO"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, 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:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr ""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, 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:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = No ho sé\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NO confie\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Hi confie absolutament\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = torna al menú principal\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " o = omet aquesta clau\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " x = ix\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "La vostra decisió? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, 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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificats que duen a una clau de confiança absoluta:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Aquesta clau pertany probablement al seu propietari\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Aquesta clau és nostra\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6478,133 -5235,105 +6540,133 @@@ msgstr "
"«sí» a la següent pregunta\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Voleu usar de tota manera aquesta clau?"
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "AVÍS: S'està usant una clau no fiable!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
#, 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:547
++#: g10/pkclist.c:562
#, 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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Açò podria significar que la signatura és falsificada.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Aquesta clau ha estat desactivada.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Nota: La clau ha caducat!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVÍS: La clau NO és de confiança!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Probablement la signatura és FALSA.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: es descarta: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: es descarta: la clau pública està desactivada\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, 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:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "no s'ha pogut connectar amb «%s»: %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6612,171 -5341,135 +6674,171 @@@ msgstr "
"\n"
"Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Usuari inexistent.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "La clau pública està desactivada.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "es descarta: la clau pública ja està establida\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "no hi ha adreces vàlides\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
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"
# Indi? ivb
# Em pense que no. jm
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Signatura separada.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Introduïu el nom del fitxer de dades: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "s'està llegint d'stdin...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "no hi ha dades signades\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "no s'han pogut obrir les dades signades `%s'\n"
# Indi? ivb
# Yeh... jm
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "el destinatari és anònim; es provarà la clau secreta %08lX ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "d'acord, som el destinatari anònim.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "la codificació antiga del DEK no està suportada\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les preferències\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "ha fallat build_packet: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "A ser revocada per:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Aquesta és una clau de revocació sensible)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, 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
++#: g10/revoke.c:327
#, 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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "ha fallat make_keysig_packet: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "S'ha creat el certificat de revocació.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, 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:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6785,20 -5478,17 +6847,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "S'ha creat el certificat de revocació.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
@@@ -6806,23 -5496,19 +6868,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, 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:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6841,88 -5527,71 +6903,88 @@@ msgstr "
"d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
"disponibles a altres!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Seleccioneu la raó de la revocació:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Cancel·la"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Segurament voleu seleccionar %d ací)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Raó de la revocació: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(No es va donar una descripció)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "És açò correcte? "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "s'hi ha creat una clau feble - reintent\n"
# És no-wrap? ivb
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"no s'ha pogut evitar una clau feble per a xifratge simètric;\n"
"hi ha hagut %d intents!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostra més informació\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "la clau pública %08lX és %lu segons anterior a la signatura\n"
msgstr[1] "la clau pública %08lX és %lu segons anterior a la signatura\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
@@@ -6930,7 -5599,6 +6992,7 @@@ msgstr[0] "la clau pública %08lX és %
msgstr[1] "la clau pública %08lX és %lu segons anterior a la signatura\n"
# Werner FIXME: Use ngettext. jm
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6944,7 -5612,6 +7006,7 @@@ msgstr[1] "
"amb el rellotge)\n"
# Werner FIXME: Use ngettext. jm
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6956,44 -5623,37 +7018,44 @@@ msgstr[1] "
"la clau s'ha creat %lu segon en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: aquesta clau ha estat revocada!"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
"clau %08lX: no hi ha una subclau per a la signatura de l'enllaç de la "
"subclau\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVÍS: no s'ha pogut %%-expandir la notació (massa gran). S'utilitza no "
"expandida.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -7001,7 -5661,6 +7063,7 @@@ msgstr "
"AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
"no expandida.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -7010,55 -5669,45 +7072,55 @@@ msgstr "
"AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
"no expandida.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s signatura de: «%s»\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "signatura:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "s'utilitzarà xifratge %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"la clau no està marcada com a insegura - no es pot utilitzar amb el GNA "
"fals!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "es descarta «%s»: duplicat\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, 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"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -7067,200 -5716,160 +7129,200 @@@ msgstr "
"# Llista de valors de confiança assignats, creat el %s\n"
"# (Utilitzeu «gpg --import-ownertrust» per a restaurar-les)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "la línia és massa llarga\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr "importa els valors de confiança"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "error en trobar el registre de confiança: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "error de lectura: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "no es pot crear el directori «%s»: %s\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "no s'ha pogut obrir «%s»\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
"reg de la base de dades de confiança %lu: ha fallat la escriptura (n=%d): "
"%s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "la transacció de la base de dades de confiança és massa gran\n"
++#: g10/tdbio.c:675
+ #, c-format
+ msgid "%s: directory does not exist!\n"
+ msgstr "%s: el directori no existeix!\n"
+
# No em passe! ;) ivb
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
- #: g10/tdbio.c:688
- #, c-format
- msgid "%s: directory does not exist!\n"
- msgstr "%s: el directori no existeix!\n"
-
- #: g10/tdbio.c:711
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: no s'ha pogut crear un registre de versió: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: s'ha creat la base de dades de confiança\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: la base de dades de confiança és invàlida\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: error en actualitzar el registre de la versió: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: error en llegir el registre de la versió: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: error en escriure el registre de la versió: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de dades de confiança: ha fallat lseek: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s no és un fitxer de base de dades de confiança\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: registre de versió amb número de registre %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: la versió de fitxer %d és invàlida\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: error en llegir el registre lliure: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: error en escriure el registre de directoris: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: no s'ha pogut posar a zero un registre: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: no s'ha pogut afegir un registre: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: s'ha creat la base de dades de confiança\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "no es poden tractar línies més llargues de %d caràcters\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "la línia d'entrada és superior a %d caràcters\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
@@@ -7270,145 -5879,119 +7332,145 @@@
# Precissament acabem de parlar d'«implementat a la llista del GNOME
# i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
# encara no m'agraden massa... jm
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmes suportats:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: error en escriure el registre de directoris: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "no s'ha trobat la clau pública %08lX: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Política: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "llista claus"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7418,175 -6001,155 +7480,186 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [fitxers]|imprimeix resums de missatges"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "clau %08lX: s'accepta com a clau fiable\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, 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:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7597,7 -6159,6 +7670,7 @@@ msgstr "
"no és necessària una comprovació de la base de dades de confiança\n"
"\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, 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"
@@@ -7649,35 -6202,28 +7722,35 @@@ msgid "public key of ultimately truste
msgstr ""
"no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, 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"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
#, fuzzy
msgid "never"
msgstr "mai "
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7689,42 -6235,33 +7762,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "[revocada]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "[caducada]"
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "desconeguda"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7735,12 -6272,10 +7808,12 @@@ msgstr "
"ha de ser el primer que figure en la línia d'ordres.\n"
# LF -> fi de línia? ivb
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
@@@ -8071,7 -6538,6 +8144,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:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8216,9 -6652,6 +8289,9 @@@ msgstr "error en la creació de la cont
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
@@@ -8751,7 -7079,6 +8824,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@@ -8776,135 -7099,105 +8849,135 @@@ msgstr "no s'ha pogut eliminar el bloc
msgid "no valid recipients given\n"
msgstr "(No es va donar una descripció)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "llista claus secretes"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "Certificat de revocació vàlid"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "Certificat correcte"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "Certificat correcte"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crea eixida amb armadura ascii"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "no usa el terminal en absolut"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
# Mode desatès (SC) ivb
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "mode desatès: no pregunta mai"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "suposa «sí» en la majoria de les preguntes"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "suposa «no» en la majoria de les preguntes"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "afegeix aquest anell a la llista"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|usa aquest servidor per a cercar claus"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOM|usa l'algoritme de xifratge NOM"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8915,48 -7208,39 +8988,48 @@@ msgstr "
"signa, comprova, xifra o desxifra\n"
"l'operació predeterminada depén de les dades introduïdes\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "no s'ha pogut connectar amb «%s»: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(No es va donar una descripció)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " o = omet aquesta clau\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "error en la creació de la contrasenya: %s\n"
# No em passe! ;) ivb
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8974,7 -7255,6 +9047,7 @@@ msgstr "Certificat correcte
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "error en crear «%s»: %s\n"
@@@ -8989,32 -7267,26 +9062,32 @@@ msgstr "error en la creació de la cont
msgid "error reading input: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -9193,7 -7432,6 +9266,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "S'ha creat el certificat de revocació.\n"
@@@ -9203,8 -7440,6 +9276,8 @@@
msgid "certificate cached\n"
msgstr "Certificat de revocació vàlid"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
@@@ -9818,13 -7930,11 +9891,13 @@@ msgstr "Certificat correcte
msgid "force the use of the default OCSP responder"
msgstr "Introduïu l'ID d'usuari del revocador designat: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9832,68 -7942,55 +9905,68 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, 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:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "Certificat de revocació vàlid"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "NOTA: aquesta clau ha estat revocada!"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, 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:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error writing base64 encoding: %s\n"
@@@ -9904,18 -8001,15 +9977,18 @@@ 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritmes suportats:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -10070,12 -8130,10 +10143,12 @@@ msgstr "forma d'ús: gpg [opcions]
msgid "colons are not allowed in the socket name\n"
msgstr "%s no és permés amb %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
@@@ -10576,77 -8532,61 +10649,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, 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:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, 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:1410
++#: dirmngr/server.c:1408
#, 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:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/cs.po
index a91a24b,535f74c..acf9a85
--- a/po/cs.po
+++ b/po/cs.po
@@@ -35,7 -35,6 +35,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg2 2.1.10\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2015-12-07 20:45+0100\n"
"Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
"Language-Team: Czech <gnupg-i18n at gnupg.org>\n"
@@@ -128,8 -112,6 +128,8 @@@ msgstr "
msgid "PIN:"
msgstr "PIN:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Heslo:"
@@@ -179,24 -150,10 +179,24 @@@ msgstr "Špatné heslo
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH klíče delší než %d bitů nejsou podporovány\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, c-format
msgid "can't create '%s': %s\n"
msgstr "nelze vytvořit „%s“: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1668
#, c-format
msgid "can't open '%s': %s\n"
msgstr "nelze otevřít „%s“: %s\n"
@@@ -271,11 -215,9 +271,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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
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:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
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"
@@@ -401,8 -319,6 +401,8 @@@ msgstr "Pro ochranu svého nového klí
msgid "Please enter the new passphrase"
msgstr "Prosím, zadejte nové heslo"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -410,130 -326,94 +410,132 @@@ msgstr "
"@Volby:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 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:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 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:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "upovídaný režim"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "být o trochu víc tichý"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "vypisovat příkazy ve stylu sh"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "vypisovat příkazy ve stylu csh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "neodpojovat se od konzole"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "neuzurpovat si klávesnici a myš"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "použít pro server soubor s protokolem"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "nepoužívat SCdémona"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
msgid "|NAME|accept some commands via NAME"
msgstr "|NÁZEV|přijímat některé příkazy přes NÁZEV"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "ignorovat požadavky na změnu TTY"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "ignorovat požadavky na změnu X displeje"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|zahodit zapamatované PINy po N sekundách"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "nepoužívat paměť PINů na podepisování"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
msgid "disallow the use of an external password cache"
msgstr "nedovolit použít vnější úložiště na hesla"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr "nedovolit klientům označovat klíče za „důvěryhodné“"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "umožnit přednastavení hesla"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ #, fuzzy
+ #| msgid "allow caller to override the pinentry"
+ msgid "disallow caller to override the pinentry"
msgstr "umožnit volajícímu přebít pinentry"
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr "umožnit zadání hesla skrze Emacs"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
msgid "enable ssh support"
msgstr "zapnout podporu pro OpenSSH"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr "zapnout podporu pro PuTTY"
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
"připomínky k překladu hlaste na <gnupg-i18n at gnupg.org>.\n"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -541,138 -421,107 +543,145 @@@ msgstr "
"Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
"Správa tajných klíčů pro @GNUPG@\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: 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:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "čtou se možnosti z „%s“\n"
- #: agent/gpg-agent.c:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "adresář „%s“ vytvořen\n"
- #: agent/gpg-agent.c:1956
+ # TODO: i18n of first %s
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
+
++#: agent/gpg-agent.c:1964
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "volání stat() na „%s“ selhalo: %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "„%s“ nelze použít jako domovský adresář\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, 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:2314
++#: agent/gpg-agent.c:2322
#, 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:2387
++#: agent/gpg-agent.c:2395
#, 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:2392
++#: agent/gpg-agent.c:2400
#, 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:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s pozastaveno\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -688,8 -535,6 +697,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:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -697,9 -542,6 +706,9 @@@ msgstr "
"@Příkazy:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -709,11 -551,9 +718,11 @@@ msgstr "
"Volby:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Použití: gpg-protect-tool [VOLBY] (-h pro nápovědu)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -721,15 -561,12 +730,15 @@@ msgstr "
"Syntaxe: gpg-protect-tool [volby] [argumenty]\n"
"Nástroj na správu tajných klíčů\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Prosím, vložte heslo, abyste zpřístupnili objekt PKCS#12."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Prosím, vložte heslo, abyste ochránili nový objekt PKCS#12."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -737,7 -574,6 +746,7 @@@ msgstr "
"Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému "
"GnuPG."
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -745,11 -581,9 +754,11 @@@ msgstr "
"Prosím, vložte heslo nebo PIN\n"
"potřebný pro dokončení této operace."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "zrušeno\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "chyba při ptaní se na heslo: %s\n"
@@@ -814,8 -638,6 +823,8 @@@ msgstr "
msgid "Yes"
msgstr "Ano"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "Ne"
@@@ -846,27 -665,22 +855,27 @@@ msgstr "V pořádku
msgid "Wrong"
msgstr "Špatně"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr "Poznámka: Toto heslo nikdy nebylo změněno.%0AProsím, nyní jej změňte."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr "Toto heslo se nezměnilo%%0Aod %.4s-%.2s-%.2s. Prosím, nyní jej změňte."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "Změnit heslo"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "Změním jej později"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -874,11 -688,9 +883,11 @@@
msgstr ""
"Opravdu chcete smazat klíč určený pomocí keygripu%%0A %s%%0A %%C%%0A?"
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
msgid "Delete key"
msgstr "Smazat klíč"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -886,7 -698,6 +895,7 @@@ msgstr "
"Pozor: Tento klíč je též veden jako klíč pro SSH!\n"
"Smazání tohoto klíče může odebrat schopnost přistupovat ke vzdáleným strojům."
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA vyžaduje, aby délka hashe byla násobkem 8 bitů\n"
@@@ -924,53 -728,43 +933,58 @@@ msgstr "ochranný algoritmus %d (%s) ne
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "ochranný algoritmus %d (%s) není podporován\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "chyba při vytváření roury: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "chyba při vytváření proudu pro rouru: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "chyba při rozdvojování procesu: %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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "chyba při spouštění „%s“: pravděpodobně není nainstalován\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "chyba v běhu „%s“: návratový kód %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, c-format
msgid "error running '%s': terminated\n"
msgstr "chyba v běhu „%s“: násilně ukončeno\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "chyba při získání návratového kódu procesu %d: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
+
+#: common/simple-pwquery.c:376
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "nelze se připojit k „%s“: %s\n"
@@@ -983,15 -775,17 +997,21 @@@ msgstr "problémy v komunikaci s gpg-a
msgid "problem setting the gpg-agent options\n"
msgstr "problém v nastavování voleb gpg-agenta\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "zrušeno uživatelem\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "problém s agentem\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problém s agentem: %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nemohu vypnout vytváření core souborů: %s\n"
@@@ -1063,17 -843,18 +1083,22 @@@ msgstr "při pokusu alokovat %lu bajt�
msgid "out of core while allocating %lu bytes"
msgstr "při pokusu alokovat %lu bajtů došla paměť"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 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"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: zastaralý parametr „%s“ – neúčinkuje\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "neznámý ladicí příznak „%s“ se ignoruje\n"
@@@ -1365,7 -1079,6 +1390,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 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "nedostatek paměti\n"
@@@ -1374,22 -1086,14 +1399,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "neplatný parametr „%.50s“\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "našli jste chybu… (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "převod z „%s“ na „%s“ není k dispozici\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open selhala: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "převod z „%s“ na „%s“ se nezdařil: %s\n"
@@@ -1428,86 -1125,72 +1448,92 @@@ msgstr "zámek „%s“ nebyl vytvořen
msgid "waiting for lock %s...\n"
msgstr "čekám na zámek %s…\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "ASCII kódování: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "neplatná hlavička ASCII kódování: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "ASCII hlavička: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "neplatná hlavička podpisu v čitelném formátu\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "neznámá ASCII hlavička: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "vnořené podpisy v čitelném formátu\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "neočekávaný ASCII armor: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "nesprávné označení řádku mínusy: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "neplatný radix64 znak %02X byl přeskočen\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "předčasný konec souboru (žádné CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "předčasný konec souboru (žádné CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "špatný formát CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Chyba CRC; %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "předčasný konec souboru (v patičce)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "chyba v patičce\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "nenalezena žádná platná data ve formátu OpenPGP.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "neplatné kódování ASCII: řádek je delší než %d znaků\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"neplatný znak (quoted-printable) v ASCII kódování – pravděpodobně byl použit "
"špatný MTA\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "není v přímo čitelném formátu"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1515,80 -1198,70 +1541,92 @@@ msgstr "
"symbolické jméno smí obsahovat pouze písmena, číslice, tečky nebo podtržítka "
"a musí končit znakem „=“\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "zápis jména uživatele musí obsahovat znak „@“\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "jméno uživatele nesmí obsahovat více než jeden znak „@“\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "hodnota nemůže obsahovat žádné kontrolní znaky\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "jméno uživatele nesmí obsahovat více než jeden znak „@“\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "symbolické jméno smí obsahovat pouze písmena, číslice, tečky nebo podtržítka "
+ "a musí končit znakem „=“\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "VAROVÁNÍ: nalezen neplatný formát zápisu data\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "není v přímo čitelném formátu"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "předání dotazu %s klientovi se nezdařilo\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Vložte heslo: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "chyba při vytváření souboru klíčů (keyring) „%s“: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: "
msgid "WARNING: %s\n"
msgstr "VAROVÁNÍ: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "nelze provést v dávkovém módu\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "Tento příkaz je dostupný pouze pro karty verze 2\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Váš výběr? "
@@@ -1650,20 -1309,10 +1688,15 @@@ msgstr "URL pro získání veřejného
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Chyba: URL je příliš dlouhé (limit je %d znaků).\n"
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "chyba při zápisu do „%s“: %s\n"
@@@ -1758,13 -1388,10 +1791,13 @@@ msgstr "Jakou délku klíče pro šifro
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:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrouhleno na %u bitů\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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"
@@@ -1818,9 -1435,6 +1851,9 @@@ msgstr " (2) Šifrovací klíč\n
msgid " (3) Authentication key\n"
msgstr " (3) Autentizační klíč\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Neplatný výběr.\n"
@@@ -1850,7 -1458,6 +1883,7 @@@ msgstr "Pokračovat (a/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Opravdu obnovit tovární nastavení (zadejte „yes“) "
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "ukončit toto menu"
@@@ -1858,7 -1464,6 +1891,7 @@@
msgid "show admin commands"
msgstr "zobraz administrátorské příkazy"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "ukázat tuto pomoc"
@@@ -1934,127 -1521,97 +1967,127 @@@ msgstr "administrátorské příkazy js
msgid "Admin commands are not allowed\n"
msgstr "administrátorské příkazy nejsou povoleny\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatný příkaz (zkuste „help“)\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "„%s“ nelze otevřít\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klíč „%s“ nenalezen: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba při čtení bloku klíče: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, c-format
msgid "key \"%s\" not found\n"
msgstr "klíč „%s“ nenalezen\n"
- #: g10/delkey.c:130 g10/delkey.c:137
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(dokud neurčíte klíč jeho otiskem)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "bez parametru „--yes“ to nemohu v dávkovém módu provést\n"
- #: g10/delkey.c:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "Smazat tento klíč ze souboru klíčů? (a/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
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:196
++#: g10/delkey.c:195
#, 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:198
++#: g10/delkey.c:197
msgid "key"
msgstr "klíče"
# deleting secret %s failed
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "subkey"
msgstr "podklíče"
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "smazání bloku klíče se nezdařilo: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "informace o důvěryhodnosti vlastníka klíče vymazány\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba při vytváření hesla: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "v módu S2K nelze použít symetrický ESK paket\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "použití šifry: %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, c-format
msgid "'%s' already compressed\n"
msgstr "„%s“ je již zkomprimován\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "VAROVÁNÍ: soubor „%s“ je prázdný\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, c-format
msgid "reading from '%s'\n"
msgstr "čte se z „%s“\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"VAROVÁNÍ: vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2063,37 -1620,30 +2096,37 @@@ msgstr "
"VAROVÁNÍ: vyžádaný komprimační algoritmus %s (%d) nevyhovuje předvolbám "
"příjemce\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "použití %s není v módu %s dovoleno\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zašifrovaný pro: „%s“\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "použití %s není v módu %s dovoleno\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s zašifrovaná data\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "zašifrováno neznámým algoritmem %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "VAROVÁNÍ: zpráva byla zašifrována slabým klíčem v symetrické šifře.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problém se zašifrovaným paketem\n"
@@@ -2152,65 -1691,49 +2185,65 @@@ 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:79
++#: g10/export.c:78
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:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr "exportovat atributy uživatelských ID (obecně ID fotografií)"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "exportovat revokační klíče označené jako „citlivé“"
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "odstranit nepoužitelné části z klíče při exportu"
- #: g10/export.c:87
++#: g10/export.c:86
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:896
++#: g10/export.c:895
msgid " - skipped"
msgstr " – přeskočeno"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "exportování tajného klíče není povoleno\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "chyba při vytváření „%s“: %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[ID uživatele nenalezeno]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(zkontrolujte argument volby „%s“)\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, fuzzy, c-format
#| msgid ""
#| "Warning: value '%s' for option '%s' should be a long key ID or a "
@@@ -2220,66 -1743,54 +2253,66 @@@ msgstr "
"Pozor: hodnota „%s“ volby „%s“ by měla být\n"
"dlouhý identifikátor klíče nebo jeho otisk\n"
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "chyba při zavírání chyba %s: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error searching the keyring: %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "chyba při prohledávání souboru klíčů (keyring): %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "„%s“ automaticky získáno přes %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, 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:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "Chybí otisk"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "tajný klíč „%s“ nenalezen: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "using \"%s\" as default secret key\n"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "jako výchozí tajný klíč se použije „%s“\n"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "using \"%s\" as default secret key\n"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "jako výchozí tajný klíč se použije „%s“\n"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
# c-format
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "vytvořit podpis"
@@@ -2287,11 -1797,9 +2320,11 @@@
msgid "make a clear text signature"
msgstr "vytvořit podpis v čitelném dokumentu"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "vytvořit podpis oddělený od dokumentu"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "šifrovat data"
@@@ -2299,15 -1806,12 +2332,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "šifrování pouze se symetrickou šifrou"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dešifrovat data (implicitně)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifikovat podpis"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "vypsat seznam klíčů"
@@@ -2319,15 -1821,12 +2352,15 @@@ msgstr "vypsat seznam klíčů a podpis
msgid "list and check key signatures"
msgstr "vypsat a zkontrolovat podpisy klíčů"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "vypsat seznam klíčů a otisků"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "vypsat seznam tajných klíčů"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "vytvořit nový pár klíčů"
@@@ -2347,7 -1842,6 +2380,7 @@@ msgstr "komplexní vytvoření páru kl
msgid "generate a revocation certificate"
msgstr "vytvořit revokační certifikát"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "odstranit klíč ze souboru veřejných klíčů"
@@@ -2375,7 -1863,6 +2408,7 @@@ msgstr "podepsat klíč lokálně
msgid "sign or edit a key"
msgstr "podepsat nebo modifikovat klíč"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "změnit heslo"
@@@ -2423,25 -1899,22 +2456,27 @@@ msgstr "aktualizovat databázi důvěry
msgid "print message digests"
msgstr "vypsat hash zprávy"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "pracovat v režimu serveru"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ #, fuzzy
+ #| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
"|HODNOTA|nastavit TOFU politiku klíči (good [dobrý], unknown [neznámý], bad "
"[špatný], ask [zeptat se], auto)"
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "vytvoř výstup zakódovaný pomocí ASCII"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ID_UŽIVATELE|použít toto ID_UŽIVATELE pro podepsání nebo dešifrování"
@@@ -2453,11 -1924,9 +2488,11 @@@ msgstr "|N|nastavit úroveň komprese n
msgid "use canonical text mode"
msgstr "použít kanonický textový mód"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|SOUBOR|zapsat výstup do SOUBORU"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "neprovádět žádné změny"
@@@ -2469,7 -1936,6 +2504,7 @@@ msgstr "vyžádat potvrzení před pře
msgid "use strict OpenPGP behavior"
msgstr "použít chování striktně podle OpenPGP"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2477,7 -1943,6 +2512,7 @@@ msgstr "
"@\n"
"(Pro kompletní seznam všech příkazů a možností použijte manuálové stránky.)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2495,11 -1960,9 +2530,11 @@@ msgstr "
" --list-keys [jména] vypsat klíče\n"
" --fingerprint [jména] vypsat otisky\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
- #: g10/gpg.c:988
++#: g10/gpg.c:991
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2509,7 -1972,6 +2544,7 @@@ msgstr "
"Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
"Výchozí operace závisí na vstupních datech.\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2517,78 -1979,63 +2552,78 @@@ msgstr "
"\n"
"Podporované algoritmy:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Veřejný klíč: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Šifra: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Komprese: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "použití: %s [přepínače] %s\n"
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "konfliktní příkazy\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "no = podpis nalezen v definici skupiny „%s“\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2596,21 -2043,18 +2631,21 @@@ msgstr "
"VAROVÁNÍ: vlastnictví adresáře „%s“ s konfiguračním souborem není nastaveno "
"nebezpečně\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2618,7 -2062,6 +2653,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:1549
++#: g10/gpg.c:1552
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
@@@ -2626,488 -2069,378 +2661,488 @@@
"nastavena bezpečně\n"
# c-format
- #: g10/gpg.c:1756
++#: g10/gpg.c:1759
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "neznámá konfigurační položka „%s“\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "zobrazovat ID fotografií během výpisu klíčů"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
msgid "show key usage information during key listings"
msgstr "ukazovat údaje o účelu klíče při výpisu klíčů"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "ukazovat URL politik během výpisu podpisů"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "ukazovat všechny poznámky během výpisu podpisů"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
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:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
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:1883
++#: g10/gpg.c:1886
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:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "ukazovat název souboru s klíči při výpisu klíčů"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "ukazovat data expirace během výpisu podpisů"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
msgid "available TOFU policies:\n"
msgstr "dostupné politiky TOFU:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "neznámá TOFU politika „%s“\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr "(možnosti lze vypsat příkazem „help“)\n"
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "neznámý formát „%s“ databáze TOFU\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, 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:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "„%s“ není platná doba expirace podpisu\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatný režim pinentry „%s“\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "„%s“ není platná znaková sada\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "nelze zpracovat URL serveru klíčů\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatný parametr pro import\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "neplatný parametr pro import\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatný parametr pro export\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "neplatný parametr pro export\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatný parametr pro výpis\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "neplatný parametr pro výpis\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "zobrazovat ID fotografií při ověřování podpisu"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "ukazovat URL politik při ověřování podpisu"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "ukazovat všechny poznámky při ověřování podpisu"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
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:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
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:3053
++#: g10/gpg.c:3060
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:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "ověřovat podpisy s daty PKA"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatný parametr pro ověření\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "neplatný parametr pro ověření\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nelze nastavit exec-path na %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVÁNÍ: %s přepíše %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Není dovoleno používat %s s %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nedává s %s smysl!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 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:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "vybraný kompresní algoritmus je neplatný\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
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:3511
++#: g10/gpg.c:3518
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:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "neplatné implicitní předvolby\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "neplatné uživatelské předvolby pro šifrování\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "neplatné uživatelské předvolby pro hashování\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "neplatné uživatelské předvolby pro komprimaci\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s dosud není funkční s %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat databázi důvěry: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [jméno souboru]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [jméno souboru]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [jméno souboru]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [jméno souboru]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
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:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [jméno souboru]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [jméno souboru]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [jméno souboru]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
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:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [jméno souboru]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [jméno souboru]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [jméno souboru]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key id_uživatele"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key id_uživatele"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id_uživatele [příkazy]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd <id-uživatele>"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odeslání na keyserver se nezdařilo: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "export klíče se nepodařil: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "export klíče se nepodařil: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dekódování z ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "kódování do ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatný hashovací algoritmus „%s“\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "chyba při rozboru názvu klíče „%s“: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "„%s“ nevypadá jako platné ID klíče, otisk klíče nebo keygrip\n"
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[jméno souboru]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Začněte psát svou zprávu…\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "zadané URL pro certifikační politiku je neplatné\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "zadané URL pro podepisovací politiku je neplatné\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
@@@ -3119,7 -2450,6 +3154,7 @@@ msgstr "|SOUBOR|brát klíče z klíč
msgid "make timestamp conflicts only a warning"
msgstr "pouze varování při konfliktu časového razítka"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|zapsat informace o stavu do tohoto FD"
@@@ -3144,125 -2470,99 +3179,125 @@@ msgstr "Nápověda není k dispozici
msgid "No help available for '%s'"
msgstr "Pro „%s“ není dostupná žádná nápověda"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "importovat podpisy, které jsou označeny jen jako místní"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "opravit poškození vzniklá při importu z PKS serveru"
- #: g10/import.c:111
++#: g10/import.c:110
msgid "do not clear the ownertrust values during import"
msgstr "nemazat údaje o důvěře během importu"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "neaktualizovat databázi důvěry po importu"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "přijímat aktualizace pouze u existujících klíčů"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "odstranit z klíče po importu nepoužitelné části"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "odstranit po importu z klíče vše, co lze"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d byl přeskočen\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu klíče byly doposud zpracovány\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Celkový počet zpracovaných klíčů: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " přeskočeny klíče PGP2: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " přeskočeny nové klíče: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez ID uživatele: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importováno: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " beze změn: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nové ID uživatelů: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nové podklíče: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " nové podpisy: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nové revokace klíčů: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " přečtené tajné klíče: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importované tajné klíče: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajné klíče nezměněny: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " neimportováno: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " odstraněné podpisy: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " odstraněné uživatelské ID: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3271,196 -2571,156 +3306,196 @@@ msgstr "
"VAROVÁNÍ: klíč %s obsahuje předvolby pro nedostupné\n"
"algoritmy na těchto ID uživatelů:\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": předvolby pro šifrovací algoritmus %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": předvolby pro podepisovací algoritmus %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": předvolby pro komprimační algoritmus %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "velmi doporučujeme aktualizaci nastavení vašich preferencí a\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"distribuci tohoto klíče aby jste předešel problémům s neshodou algoritmů\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "nelze aktualizovat předvolby s: gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "klíč %s: chybí identifikátor uživatele\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, c-format
msgid "key %s: %s\n"
msgstr "klíč %s: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr "zamítnut kontrolou při importu"
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "klíč %s: poškození PKS podklíče opraveno\n"
# c-format
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "klíč %s: přijat id uživatele \"%s\",který není podepsán jím samým\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "klíč %s: chybí platný identifikátor uživatele\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klíč %s: veřejný klíč nenalezen: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "klíč %s: nový klíč - přeskočen\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, 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:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "zapisuje se do „%s“\n"
- #: g10/import.c:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "chyba při zápisu souboru klíčů (keyring) „%s“: %s\n"
- #: g10/import.c:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klíč %s: veřejný klíč „%s“ importován\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klíč %s: neodpovídá naší kopii\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, 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:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klíč %s: „%s“ 1 nový podpis\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klíč %s: „%s“ %d nových podpisů\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klíč %s: „%s“ 1 nový podklíč\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klíč %s: „%s“ %d nových podklíčů\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, 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:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klíč %s: „%s“ beze změn\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "klíč %s: tajný klíč importován\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "klíč %s: tajný klíč již existuje\n"
- #: g10/import.c:1579
++#: g10/import.c:1578
#, 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:1684
++#: g10/import.c:1683
#, c-format
msgid "secret key %s: %s\n"
msgstr "tajný klíč %s: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "import tajných klíčů není povolen\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3475,196 -2735,179 +3510,221 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "Pro migraci „%s“ u každé karty spusťte: %s\n"
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klíč %s: „%s“ revokační certifikát importován\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klíč %s: neexistuje id uživatele pro podpis\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, 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:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klíč %s: neplatná vazba podklíče\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, 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:2109
++#: g10/import.c:2108
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "klíč %s: neexistuje podklíč pro revokaci klíče\n"
- #: g10/import.c:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klíč %s: neplatný revokační podklíč\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, 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:2182
++#: g10/import.c:2181
#, 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:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "klíč %s: podklíč přeskočen\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, 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:2596
++#: g10/import.c:2595
#, 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"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "chyba při vytváření schránky na klíče (keybox) „%s“: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, c-format
msgid "error creating keyring '%s': %s\n"
msgstr "chyba při vytváření souboru klíčů (keyring) „%s“: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, c-format
msgid "keybox '%s' created\n"
msgstr "schránka na klíče (keybox) „%s“ vytvořena\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, c-format
msgid "keyring '%s' created\n"
msgstr "soubor klíčů (keyring) „%s“ vytvořen\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "zdroj bloku klíče „%s“: %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, c-format
msgid "error opening key DB: %s\n"
msgstr "chyba při otevírání databáze klíčů: %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "selhalo obnovení vyrovnávací paměti klíčů: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revokace]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[podpis klíče jím samým]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d špatných podpisů\n"
- msgstr[1] "%d špatných podpisů\n"
- msgstr[2] "%d špatných podpisů\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "karta nepodporuje hashovací algoritmus %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "Good signature from"
+ msgid " (reordered signatures follow)"
+ msgstr "Dobrý podpis od"
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "key %s: %s\n"
+ msgid "key %s:\n"
+ msgstr "klíč %s: %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
+ msgstr[1] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
+ msgstr[2] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3673,28 -2916,28 +3733,32 @@@ msgstr[0] "1 podpis neověřen, protož
msgstr[1] "1 podpis neověřen, protože chybí klíč\n"
msgstr[2] "1 podpis neověřen, protože chybí klíč\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 podpis neověřen, protože vznikla chyba\n"
- msgstr[1] "1 podpis neověřen, protože vznikla chyba\n"
- msgstr[2] "1 podpis neověřen, protože vznikla chyba\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d špatných podpisů\n"
+ msgstr[1] "%d špatných podpisů\n"
+ msgstr[2] "%d špatných podpisů\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] ""
- "objeveno %d identifikátorů uživatele bez platného podpisu jím samým\n"
- msgstr[1] ""
- "objeveno %d identifikátorů uživatele bez platného podpisu jím samým\n"
- msgstr[2] ""
- "objeveno %d identifikátorů uživatele bez platného podpisu jím samým\n"
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Dobrý podpis od"
+ msgstr[1] "Dobrý podpis od"
+ msgstr[2] "Dobrý podpis od"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3706,17 -2949,14 +3770,17 @@@ msgstr "
"kontrolou otisků z různých zdrojů…)?\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Důvěřuji částečně\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Důvěřuji úplně\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3726,52 -2966,40 +3790,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:501
++#: g10/keyedit.c:1014
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:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "Přeskakuje se ID uživatele „%s“, což není textové ID.\n"
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Uživatelské ID „%s“ je revokováno."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Nelze podepsat.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Vypršela platnost uživatelského ID „%s“."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, 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:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID uživatele „%s“ je připraveno k podpisu."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "Podepsat? (a/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3780,11 -3008,9 +3844,11 @@@ msgstr "
"Podpis klíče „%s“ jím samým je\n"
"podpis formátu PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3793,13 -3019,11 +3857,13 @@@ msgstr "
"Platnost vašeho podpisu na „%s“\n"
"vypršela.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3808,43 -3032,34 +3872,43 @@@ msgstr "
"Váš současný podpis na „%s“\n"
"je pouze lokální.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "„%s“ je již podepsán klíčem %s\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Chcete klíč přesto znova podepsat? (a/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nic k podepsání klíčem %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Platnost klíče vypršela!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Platnost klíče vyprší %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3854,31 -3069,25 +3918,31 @@@ msgstr "
"patří výše uvedené osobě.\n"
"Pokud neznáte odpověď, zadejte „0“.\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Neodpovím.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Nijak jsem to nekontroloval(a).%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, 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:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
msgid "Your selection? (enter '?' for more information): "
msgstr "Váš výběr? (pro podrobnosti zadejte „?“): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3887,225 -3096,167 +3951,221 @@@ msgstr "
"Jste si jistý(á), že chcete podepsat tento klíč\n"
"svým klíčem „%s“ (%s)\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Jedná se o podpis klíče jím samým.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "Podpis bude označen jako neexportovatelný.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "Podpis bude označen jako neodvolatelný (non-revocable).\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "Nijak jsem tento klíč neověřil.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "Částečně jsem ověřil tento klíč.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "Velmi pečlivě jsem ověřil tento klíč.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Skutečně podepsat? (a/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "podepsání selhalo: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
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:1223
++#: g10/keyedit.c:1736
#, 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:1270
- 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:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "uložit a ukončit"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "vypsat otisk klíče"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
msgid "show the keygrip"
msgstr "ukázat keygrip"
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "vypsat seznam klíčů a id uživatelů"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "vyberte identifikátor uživatele N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "vyberte podklíč N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "kontrolovat podpisy"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
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:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "podepsat vybrané uživatelské ID lokálně"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "podepsat vybrané uživatelské ID důvěryhodným podpisem"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr "podepsat vybraná uživatelská ID neodvolatelným podpisem"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "přidat identifikátor uživatele"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "přidat fotografický ID"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "smazat vybrané ID uživatele"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "přidat podklíč"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "přidat klíč na kartu"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "přesunout klíč na kartu"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "přesunout záložní klíč na kartu"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "smazat vybrané podklíče"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "přidat revokační klíč"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "smazat podpisy z vybraných uživatelských ID"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
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:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "označit vybrané uživatelské ID jako primární"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "vypsat seznam předvoleb (pro experty)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "vypsat seznam předvoleb (podrobně)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "nastavit sadu preferencí pro vybrané uživatelské ID"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
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:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "zadat poznámku pro vybraná uživatelská ID"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "změnit heslo"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "změnit důvěryhodnost vlastníka klíče"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "revokovat podpisu na vybraných uživatelských ID"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "revokovat vybrané uživatelské ID"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "revokovat klíč nebo vybrané podklíče"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "nastavit klíč jako platný (enable)"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "nastavit klíč jako neplatný (disable)"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "ukázat vybrané fotografické ID"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
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:1465
++#: g10/keyedit.c:1931
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:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Tajný klíč je dostupný.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Pro provedení této operace je potřeba tajný klíč.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4116,246 -3267,194 +4176,252 @@@ 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:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Klíč revokován."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
msgid "Really sign all text user IDs? (y/N) "
msgstr "Opravdu podepsat všechna textová ID uživatele? (a/N) "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Nápověda: Vyberte id uživatele k podepsání\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Neznámý typ podpisu „%s“\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Musíte vybrat alespoň jeden id uživatele.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Použijte příkaz „%s“.)\n"
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Nemůžete smazat poslední id uživatele!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Opravdu odstranit všechny vybrané id uživatele? (a/N) "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "Opravdu přesunout primární klíč? (a/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Musíte vybrat právě jeden klíč.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "Příkaz očekává jméno souboru jako argument\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Nelze otevřít „%s“: %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Musíte vybrat alespoň jeden klíč.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Opravdu chcete smazat vybrané klíče? (a/N) "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "Opravdu chcete smazat tento klíč? (a/N) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Opravdu revokovat všechny vybrané id uživatele? (a/N) "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "Opravdu revokovat tento id uživatele? (a/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Opravdu chcete revokovat celý klíč? (a/N) "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Opravdu chcete revokovat vybrané podklíče? (a/N) "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Opravdu chcete revokovat tento podklíč? (a/N) "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
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:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Nastavit seznam předvoleb:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Opravdu aktualizovat předvolby? (a/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Uložit změny? (a/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Ukončit bez uložení? (a/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "aktualizace selhala: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
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:2494
++#: g10/keyedit.c:2968
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "„%s“ není otisk\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "„%s“ není primární otisk\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "read error in '%s': %s\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "chyba při čtení v „%s“: %s\n"
+
++#: g10/keyedit.c:3099
msgid "No matching user IDs."
msgstr "Žádný identifikátor uživatele neodpovídá."
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
msgid "Nothing to sign.\n"
msgstr "Nic na podepsání.\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Hash: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Vlastnosti: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "Keyserver bez modifikace"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Preferovaný keyserver: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "Poznámky: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(citlivá informace)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "vytvořen: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "revokován: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "platnost skončila: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "platnost skončí: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "použití: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "číslo karty: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "důvěra: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "platnost: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Tento klíč byl označen za neplatný (disabled)"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4364,17 -3463,12 +4430,17 @@@ msgstr "
"být nutně správné, dokud znova nespustíte program.\n"
# status
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "odvolán"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "platnost skončila"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4382,15 -3476,12 +4448,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "POZOR: Vašemu šifrovacímu podklíči brzy vyprší platnost.\n"
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
msgid "You may want to change its expiration date too.\n"
msgstr "Dobu platnosti také můžete změnit.\n"
- #: g10/keyedit.c:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4399,35 -3490,27 +4465,35 @@@ msgstr "
"VAROVÁNÍ: Toto je PGP2 klíč. Přidání fotografického ID může v některých\n"
" verzích PGP vést k odmítnutí tohoto klíče.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
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:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Smazat tento dobrý podpis? (a/N/u)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Smazat tento neplatný podpis? (a/N/u)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Smazat tento neznámý podpis? (a/N/u)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4436,20 -3519,16 +4502,20 @@@ msgstr[0] "Smazán %d podpis.\n
msgstr[1] "Smazán %d podpis.\n"
msgstr[2] "Smazán %d podpis.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Nic nebylo smazáno.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "neplatný"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4458,17 -3537,14 +4524,17 @@@ msgstr[0] "Uživatelské ID „%s“: %
msgstr[1] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
msgstr[2] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Uživatelské ID „%s“: je již minimalizované\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Uživatelské ID „%s“: je již odstraněné\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4477,260 -3553,202 +4543,260 @@@ 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:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Vložte identifikátor uživatele pověřeného revokací: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
msgid "this key has already been designated as a revoker\n"
msgstr "tento klíč již byl pověřen revokací\n"
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
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:4018
++#: g10/keyedit.c:4536
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "Jste si jistí, že chcete změnit dobu expirace více podklíčům? (a/N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "Měním dobu expirace podklíče.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Měním dobu expirace primárního klíče.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, 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:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Prosím, vyberte právě jeden id uživatele .\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "Vložte URL preferovaného serveru klíčů: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
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:4557
++#: g10/keyedit.c:5181
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "Vložte poznámku: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "Pokračovat (a/N)? "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Neexistuje uživatelské ID s hashem %s\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Neexistuje podklíč s ID klíče „%s“.\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "Neexistuje podklíč s indexem %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID uživatele: „%s“\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (neexportovatelné)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnost podpisu vyprší %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
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:5178
++#: g10/keyedit.c:5802
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:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "Nepodepsáno vámi.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (neodvolatelné)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, 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:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Chystáte se revokovat tyto podpisy:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Opravdu vytvořit revokační certifikáty? (a/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "neexistuje tajný klíč\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "uživatelské ID „%s“ je již revokováno\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Klíč %s je již revokován.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Podklíč %s je již revokován.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klíč %s (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "duplicita předvolby „%s“\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "příliš mnoho předvoleb pro šifrování\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "příliš mnoho předvoleb pro vzorkování\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "příliš mnoho předvoleb pro komprimaci\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "neplatná položka „%s“ v řetězci s předvolbami\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "zapisuji podpis klíče jím samým (direct signature)\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "zapisuji podpis klíče sebou samým\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "zapisuji „key-binding“ podpis\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatná délka klíče; použiji %u bitů\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "délka klíče zaokrouhlena na %u bitů\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"VAROVÁNÍ: některé OpenPGP programy nedokáží zacházet s DSA klíčem s takto "
"dlouhým hashem\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Podepisování"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Certifikování"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Šifrování"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Autentizace"
@@@ -4744,150 -3762,119 +4810,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Pro klíč %s lze provést: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "Aktuálně povolené akce: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Zapnout/vypnout schopnost podepisovat\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Zapnout/vypnout schopnost šifrovat\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Zapnout/vypnout schopnost autentizovat\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Konec\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Prosím, vyberte druh klíče, který chcete:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA a RSA (implicitní)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA a Elgamal\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (pouze pro podpis)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (pouze pro podpis)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (pouze pro šifrování)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (pouze pro šifrování)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (nastavit si vlastní použití)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (nastavit si vlastní použití)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC a ECC\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (pouze pro podpis)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (nastavit si vlastní použití)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (pouze pro šifrování)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Existující klíč\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "Vložte keygrip: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Není platným keygripem (očekáváno 40 šestnáctkových číslic)\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "Klíč s takovým keygripem neexistuje\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "klíč %s může mít délku v intervalu %u až %u bitů.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Jakou délku podklíče si přejete? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Jakou délku klíče si přejete? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Požadovaná délka klíče je %u bitů.\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, c-format
msgid "rounded to %u bits\n"
msgstr "zaokrouhleno na %u bitů\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
msgid "Please select which elliptic curve you want:\n"
msgstr "Prosím, vyberte, kterou eliptickou křivku chcete:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4903,7 -3890,6 +4969,7 @@@ msgstr "
" <n>m = doba platnosti klíče skončí za n měsíců\n"
" <n>y = doba platnosti klíče skončí za n let\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4919,38 -3905,30 +4985,38 @@@ msgstr "
" <n>m = doba platnosti podpisu skončí za n měsíců\n"
" <n>y = doba platnosti podpisu skončí za n let\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Klíč je platný pro? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Podpis je platný pro? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "neplatná hodnota\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "Platnost klíče nikdy neskončí\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "Platnost podpisu nikdy neskončí\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "Platnost klíče skončí v %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "Platnost podpisu skončí v %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -4958,11 -3936,9 +5024,11 @@@ msgstr "
"Váš systém neumí zobrazit data po roce 2038.\n"
"V každém případě budou data korektně zpracovávána do roku 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Je to správně (a/N)? "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4977,7 -3953,6 +5043,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -4993,49 -3968,38 +5059,49 @@@ msgstr "
" „Magda Prochazkova (student) <magda at domena.cz>“\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Jméno a příjmení: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Neplatný znak ve jméně\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr "Znaky „%s“ a „%s“ se ve jméně nesmí objevit\n"
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Jméno nemůže začínat číslicí\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Jméno musí být dlouhé alespoň 5 znaků\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "E-mailová adresa: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Neplatná e-mailová adresa\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Komentář: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Neplatný znak v komentáři\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Používáte znakovou sadu „%s“.\n"
- #: g10/keygen.c:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5046,7 -4010,6 +5112,7 @@@ msgstr "
" „%s“\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5061,33 -4024,26 +5127,33 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "jJkKeEPpUu"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Změnit (J)méno, (E)-mail nebo (U)končit? "
- #: g10/keygen.c:2658
++#: g10/keygen.c:2671
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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Nejdřív, prosím, opravte chybu\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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 -4056,10 +5166,12 @@@ msgstr "
"používat disky); díky tomu má generátor lepší šanci získat dostatek "
"entropie.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvoření klíče se nepodařilo: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5116,62 -4070,49 +5182,62 @@@ msgstr "
" „%s“\n"
"\n"
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr "Pokračovat (A/n) "
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Klíč pro „%s“ již existuje\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
msgid "Create anyway? (y/N) "
msgstr "Přesto vytvořit? (a/N) "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
msgid "creating anyway\n"
msgstr "přesto se vytváří\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, 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:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Vytváření klíče bylo zrušeno.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Poznámka: záloha klíče z karty uložena do „%s“\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, c-format
msgid "writing public key to '%s'\n"
msgstr "veřejný klíč se zapisuje do „%s“\n"
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenalezen zapisovatelný soubor veřejných klíčů (pubring): %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
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:4207
++#: g10/keygen.c:4233
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"
@@@ -5179,7 -4120,6 +5245,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:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5187,7 -4127,6 +5253,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:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5195,47 -4134,36 +5261,47 @@@ msgstr "
"klíč byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajné části primárního klíče nejsou dostupné.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Opravdu vytvořit? (a/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "nikdy "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Kritická podepisovací politika: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Podepisovací politika: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Kriticky preferovaný keyserver: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Kritická podepisovací notace: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Podepisovací notace: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d good signatures\n"
msgid "%d good signature\n"
@@@ -5244,7 -4172,14 +5310,16 @@@ msgstr[0] "%d dobrých podpisů\n
msgstr[1] "%d dobrých podpisů\n"
msgstr[2] "%d dobrých podpisů\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 podpis neověřen, protože vznikla chyba\n"
+ msgstr[1] "1 podpis neověřen, protože vznikla chyba\n"
+ msgstr[2] "1 podpis neověřen, protože vznikla chyba\n"
+
++#: g10/keylist.c:562
#, fuzzy, c-format
#| msgid "Warning: %lu key(s) skipped due to their large size\n"
msgid "Warning: %lu key skipped due to its large size\n"
@@@ -5253,47 -4188,37 +5328,47 @@@ msgstr[0] "Pozor: %lu klíč(ů) přesk
msgstr[1] "Pozor: %lu klíč(ů) přeskočen(o) kvůli jejich přílišné velikosti\n"
msgstr[2] "Pozor: %lu klíč(ů) přeskočen(o) kvůli jejich přílišné velikosti\n"
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Soubor klíčů (keyring)"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "přeskočen „%s“: %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Otisk primárního klíče:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Otisk primárního klíče:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Otisk podklíče:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " Otisk klíče ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " Sériové číslo karty ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, c-format
msgid "caching keyring '%s'\n"
msgstr "zapamatovává se soubor klíčů „%s“\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5302,7 -4227,6 +5377,7 @@@ msgstr[0] "%lu klíčů již uloženo
msgstr[1] "%lu klíčů již uloženo v keši (%lu podpisů)\n"
msgstr[2] "%lu klíčů již uloženo v keši (%lu podpisů)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
@@@ -5311,7 -4235,6 +5386,7 @@@ msgstr[0] "vyprázdní keš
msgstr[1] "vyprázdní keš"
msgstr[2] "vyprázdní keš"
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5320,58 -4243,45 +5395,58 @@@ msgstr[0] "1 špatný podpis\n
msgstr[1] "1 špatný podpis\n"
msgstr[2] "1 špatný podpis\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: soubor klíčů (keyring) vytvořen\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr "přebít nastavení proxy pro dirmngr"
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "zahrnout do výsledku hledání odvolané klíče"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "zahrnout podklíče, když se hledá podle ID klíče"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr "přebít nastavení časového limitu pro dirmngr"
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "automaticky získávat klíče při ověřování podpisů"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
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:104
++#: g10/keyserver.c:103
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:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "zneplatněn"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Vložte číslo (čísla), „N“ pro další, nebo „Q“ pro konec > "
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, 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:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "„%s“ není ID klíče: přeskočeno\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5380,457 -4290,363 +5455,457 @@@ msgstr[0] "aktualizuji %d klíčů z %s
msgstr[1] "aktualizuji %d klíčů z %s\n"
msgstr[2] "aktualizuji %d klíčů z %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "klíč „%s“ nebyl na serveru klíčů nalezen\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "klíč nebyl na serveru klíčů nalezen\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "žádný server klíčů není znám (použijte volbu --keyserver)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "požaduji klíč %s ze %s server %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "požaduji klíč %s z %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "žádná operace se serverem klíčů!\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "posílám klíč %s na %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, c-format
msgid "requesting key from '%s'\n"
msgstr "požaduje se klíč z „%s“\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROVÁNÍ: URI %s nelze získat: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "podivná velikost šifrovacího klíče pro sezení (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s zašifrovaný klíč sezení\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "heslo (passphrase) generováno s použitím neznámého algoritmu %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "veřejný klíč je %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "data zašifrována veřejným klíčem: správný DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "zašifrována %u-bitovým %s klíčem, ID %s, vytvořeným %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " „%s“\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
# [kw]
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "zašifrováno %s klíčem, ID %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "dešifrování veřejným klíčem selhalo: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "zašifrováno s heslem %lu\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "zašifrováno jedním heslem\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "předpokládám %s šifrovaných dat\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"algoritmus IDEA není dostupný; optimisticky se jej pokusíme nahradit "
"algoritmem %s\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "VAROVÁNÍ: zpráva nebyla chráněna proti porušení její integrity\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "dešifrování o.k.\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROVÁNÍ: se zašifrovanou zprávou bylo manipulováno!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "dešifrování selhalo: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "původní jméno souboru='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "VAROVÁNÍ: zachyceno více prostých textů\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
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:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "nenalezen žádná podpis\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ŠPATNÝ podpis od „%s“"
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypršenou platností od „%s“"
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "Dobrý podpis od „%s“"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "verifikace podpisu potlačena\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "neumím pracovat s těmito nejednoznačnými daty\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Podpis vytvořen %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, 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:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Klíč k dispozici na: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[nejistý]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " alias „%s“"
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnost podpisu skončila %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnost podpisu skončí %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binární formát"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "textový formát"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "neznámý formát"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
msgid ", key algorithm "
msgstr ", algoritmus klíče"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "POZOR: nejedná se o oddělený podpis. Soubor „%s“ NEBYL ověřen!\n"
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nemohu ověřit podpis: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "toto není podpis oddělený od dokumentu\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatný podpis třídy 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starého typu (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) selhal v %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
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:302
++#: g10/misc.c:300
#, 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:321
++#: g10/misc.c:319
#, 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:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "VAROVÁNÍ: vyžádaný algoritmus %s není doporučen\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "%s:%u: read error: %s\n"
msgid "(reported error: %s)\n"
msgstr "%s:%u: chyba čtení: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in '%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "chyba při čtení v „%s“: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: použití parametru „%s“ se nedoporučuje\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, 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:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "použijte místo něj „%s%s“ \n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: „%s“ je v tomto souboru zastaralý – účinkuje pouze v %s\n"
- #: g10/misc.c:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Nezkomprimováno"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "nezkomprimováno|nic"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "nejednoznačná volba „%s“\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, c-format
msgid "unknown option '%s'\n"
msgstr "neznámá volba „%s“\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
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:1754
++#: g10/misc.c:1752
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "neznámý slabý hashovací algoritmus „%s“\n"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, c-format
msgid "File '%s' exists. "
msgstr "Soubor „%s“ existuje. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Přepsat (a/N)? "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: neznámá přípona\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Vložte nový název souboru"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "zapisuji do standardního výstupu\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "v „%s“ se předpokládají podepsaná data\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, c-format
msgid "new configuration file '%s' created\n"
msgstr "vytvořen nový konfigurační soubor „%s“\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "VAROVÁNÍ: nastavení z „%s“ nejsou při tomto spuštění zatím aktivní\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nemohu pracovat s algoritmem veřejného klíče %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VAROVÁNÍ: potencionálně nebezpečně symetricky zašifrován klíč sezení\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpacket typu %d má nastavený kritický bit\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problém s agentem: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (hlavní ID klíče %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -5845,15 -4661,12 +5920,15 @@@ msgstr "
"Klíč o délce %u bitů, typ %s, ID %s\n"
"vytvořený %s%s.\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Vložit heslo\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "zrušeno uživatelem\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -5862,41 -4675,32 +5937,41 @@@ msgstr "
"Musíte znát heslo, abyste odemkli tajný klíč pro\n"
"uživatele: „%s“\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "délka %u bitů, typ %s, klíč %s, vytvořený %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (podklíč na hlavním klíči ID %s)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Prosím, zadejte heslo, abyste odemkli tajný klíč OpenPGP:"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Prosím, zadejte heslo, abyste mohli importovat tajný klíč OpenPGP:"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný podklíč OpenPGP:"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný klíč OpenPGP:"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Opravdu chcete trvale smazat tajný klíč podklíče OpenPGP:"
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Opravdu chcete trvale smazat tajný klíč OpenPGP:"
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, c-format
msgid ""
"%s\n"
@@@ -5956,31 -4752,24 +6031,31 @@@ msgstr "Je tato fotografie správná (a
msgid "unable to display photo ID!\n"
msgstr "nelze zobrazit photo ID!\n"
- #: g10/pkclist.c:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Důvod nebyl specifikován"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Klíč je nahrazen"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Klíč byl zkompromitován"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Klíč se již nepoužívá"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "Identifikátor uživatele již neplatí"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "důvod pro revokaci: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "revokační poznámka: "
@@@ -5994,52 -4783,41 +6069,52 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMuUsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Není přiřazena žádná hodnota důvěry:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " alias „%s“\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Nevím nebo neřeknu\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Nedůvěřuji\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Důvěřuji absolutně\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = zpět do hlavního menu\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = přeskočit tento klíč\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " u = ukončit\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6048,37 -4826,29 +6123,37 @@@ msgstr "
"Minimální úroveň důvěry tohoto klíče je: %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Vaše rozhodnutí? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
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:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
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:452
++#: g10/pkclist.c:451
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:478
++#: g10/pkclist.c:477
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"
@@@ -6089,129 -4859,101 +6164,129 @@@ msgstr "
"následující otázku odpovědět ano\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "Použít přesto tento klíč? (a/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "VAROVÁNÍ: Je použit nedůvěryhodný klíč!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " To může znamenat, že podpis je padělaný.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Poznámka: Tento klíč byl označen jako neplatný (disabled).\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Poznámka: Podepisovatelova ověřená adresa je „%s“\n"
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, 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:601
++#: g10/pkclist.c:616
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:609
++#: g10/pkclist.c:624
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:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Poznámka: Skončila platnost tohoto klíče!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROVÁNÍ: NEDŮVĚŘUJEME tomuto klíči!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Tento podpis je pravděpodobně PADĚLANÝ.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: přeskočeno: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, 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:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, 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:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to '%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "nelze se připojit k „%s“: %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "zadána volba „%s“, ale nezadány žádné platné výchozí klíče\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "zadána volba „%s“, ale chybí volba „%s“\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Aktuální příjemci:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6219,161 -4961,125 +6294,161 @@@ msgstr "
"\n"
"Napište identifikátor uživatele (user ID). Ukončete prázdným řádkem: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Takový identifikátor uživatele neexistuje.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Veřejný klíč je neplatný (disabled).\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "přeskočeno: veřejný klíč je již nastaven\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "neznámý implicitní adresát „%s“\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "žádné platné adresy\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Poznámka: klíči %s chybí vlastnost %s\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Podpis oddělený od dokumentu.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Prosím, vložte název datového souboru: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "čtu standardní vstup…\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "chybí podepsaná data\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "nelze otevřít podepsaná data „%s“\n"
- #: g10/plaintext.c:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nelze otevřít podepsaná data na deskriptoru=%d: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonymní adresát; zkouším tajný klíč %s…\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "o.k., my jsme anonymní adresát.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "staré kódování DEK není podporováno\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "šifrovací algoritmus %d%s je neznámý nebo je zneplatněn\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "VAROVÁNÍ: v předvolbách příjemce nenalezen šifrovací algoritmus %s\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "Poznámka: platnost tajného klíče %s skončila v %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "selhalo vytvoření paketu (build_packet): %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "klíč %s: chybí identifikátor uživatele\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Revokován:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Toto je citlivý revokační klíč)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
msgid "Secret key is not available.\n"
msgstr "Tajný klíč není dostupný.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "nařízen výstup do formátu ASCII.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "vytvoření podepisovacího paketu (make_keysig_packet) selhalo: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Revokační certifikát vytvořen.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "pro „%s“ nebyl nalezen žádný revokační klíč\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Toto je revokační certifikát pro OpenPGP klíč:"
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
#, fuzzy
#| msgid ""
#| "Use it to revoke this key in case of a compromise or loss of\n"
@@@ -6391,7 -5097,6 +6466,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:576
++#: g10/revoke.c:575
#, fuzzy
#| msgid ""
#| "To avoid an accidental use of this file, a colon has been inserted\n"
@@@ -6406,13 -5111,11 +6481,13 @@@ 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:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Revokační certifikát vytvořen.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, c-format
msgid "secret key \"%s\" not found\n"
msgstr "tajný klíč „%s“ nenalezen\n"
@@@ -6420,21 -5123,17 +6495,21 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr "„%s“ odpovídá více tajným klíčům:\n"
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, c-format
msgid "error searching the keyring: %s\n"
msgstr "chyba při prohledávání souboru klíčů (keyring): %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
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:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6453,77 -5152,61 +6528,77 @@@ 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:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Prosím vyberte důvod revokace:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Zrušit"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Pravděpodobně zda chcete vybrat %d)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Důvod revokace: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Nebyl zadán Žádný popis)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Je důvod revokace vybrán správně? (a/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "vytvořen slabý klíč – zkouším znovu\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"nemohu se vyvarovat slabého klíče pro symetrickou šifru; operaci jsem zkusil "
"%d krát!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "%s klíč %s používá nebezpečný (%zubitový) hash\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
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:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "VAROVÁNÍ: konflikt hashe podpisu ve zprávě\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "více informací naleznete na adrese %s\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6532,7 -5215,6 +6607,7 @@@ msgstr[0] "veřejný klíč %s je o %l
msgstr[1] "veřejný klíč %s je o %lu sekund novější než podpis\n"
msgstr[2] "veřejný klíč %s je o %lu sekund novější než podpis\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6541,7 -5223,6 +6616,7 @@@ msgstr[0] "veřejný klíč %s je o %l
msgstr[1] "veřejný klíč %s je o %lu sekund novější než podpis\n"
msgstr[2] "veřejný klíč %s je o %lu sekund novější než podpis\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6559,7 -5240,6 +6634,7 @@@ msgstr[2] "
"klíč %s byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6576,41 -5256,34 +6651,41 @@@ msgstr[2] "
"klíč %s byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, 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:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "klíč %s: podklíč který je svázán s podpisem neexistuje\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"VAROVÁNÍ: nelze %%-expandovat notaci (příliš dlouhé). Použity "
"neexpandované.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6618,7 -5291,6 +6693,7 @@@ msgstr "
"VAROVÁNÍ: nemohu %%-expandovat URL politiky (příliš dlouhé). Použity "
"neexpandované.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6627,12 -5299,10 +6702,12 @@@ msgstr "
"VAROVÁNÍ: nemohu %%-expandovat URL preferovaného keyservery (příliš dlouhé). "
"Použity neexpandované.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s podpis od: „%s“\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6640,42 -5310,34 +6715,42 @@@ msgstr "
"VAROVÁNÍ: vyžádaný hashovací algoritmus %s (%d) nevyhovuje předvolbám "
"příjemce\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "podepisuji:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude použito šifrování %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"klíč není označen jako nedostatečně bezpečný – nemohu jej použít s falešným "
"RNG!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "přeskočen „%s“: duplikován\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "přeskočeno: tajný klíč je už v databázi\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, 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"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6684,294 -5346,235 +6759,294 @@@ msgstr "
"# Seznam přidělených hodnot důvěry, vytvořen %s\n"
"# (Použijte „gpg --import-ownertrust“ k jeho obnově)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, c-format
msgid "error in '%s': %s\n"
msgstr "chyba v „%s“: %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "řádek je příliš dlouhý"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "sloupec schází"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "neplatný otisk"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "schází hodnota důvěryhodnosti vlastníka"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "chyba při hledání záznamu důvěryhodnosti v „%s“: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, c-format
msgid "read error in '%s': %s\n"
msgstr "chyba při čtení v „%s“: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "databáze důvěry: synchronizace selhala %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "pro „%s“ nelze vytvořit zámek\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, c-format
msgid "can't lock '%s'\n"
msgstr "„%s“ nelze zamknout\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "záznam v databázi důvěry %lu: lseek() se nepodařil: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "záznam v databázi důvěry %lu: zápis se nepodařil (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
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:606
- #, c-format
- msgid "can't access '%s': %s\n"
- msgstr "k „%s“ nelze přistoupit: %s\n"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: adresář neexistuje!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "k „%s“ nelze přistoupit: %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: nepodařilo se vytvořit záznam verze: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: vytvořena neplatná databáze důvěry\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: databáze důvěry vytvořena\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
msgid "Note: trustdb not writable\n"
msgstr "Poznámka: do databáze důvěry nelze zapisovat\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: neplatná databáze důvěry\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: nepodařilo se vytvořit hashovací tabulku: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: chyba při aktualizaci záznamu verze: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: chyba při čtení záznamu verze: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: chyba při zápisu záznamu verze: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "databáze důvěry: procedura lseek() selhala: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "databáze důvěry: procedura read() (n=%d) selhala: %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: není soubor databáze důvěry\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: záznam verze s číslem %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: neplatná verze souboru %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: chyba při čtení volného záznamu: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: chyba při zápisu adresářového záznamu: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: vynulování záznamu selhalo: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: přidání záznamu selhalo: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "Chyba: Databáze důvěry je poškozena.\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "nemohu pracovat s řádky delšími než %d znaků\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "vstupní řádek je delší než %d znaků\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "chyba při odesílání standardního parametru: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "nepodporovaný algoritmus: %s"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "chyba při zápisu kódování base64: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "chyba při inicializaci čtecího objektu: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "chyba při otevírání „%s“: %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "veřejný klíč %s nebyl nalezen: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
#| msgid "error setting OCSP target: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "chyba při nastavování cíle OCSP: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "chyba při zjišťování ID odpovídače: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "platnost: %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "chyba při získání uložených příznaků: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -6979,18 -5582,15 +7054,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vypsat seznam klíčů"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
@@@ -6998,7 -5598,6 +7073,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7007,7 -5606,6 +7082,7 @@@ msgstr[0] "vypsat hash zprávy
msgstr[1] "vypsat hash zprávy"
msgstr[2] "vypsat hash zprávy"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
@@@ -7015,7 -5613,6 +7090,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
@@@ -7023,7 -5620,6 +7098,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7034,183 -5630,164 +7109,195 @@@ msgstr[2] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "chyba při vytváření roury: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "vypsat hash zprávy"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "„%s“ není platný dlouhý keyID\n"
- #: g10/trustdb.c:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "klíč %s: akceptován jako důvěryhodný klíč\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "klíč %s označen jako absolutně důvěryhodný.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
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:431
++#: g10/trustdb.c:430
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:468
++#: g10/trustdb.c:467
#, 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:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "použití modelu důvěry %s\n"
@@@ -7219,7 -5795,6 +7306,7 @@@
msgid "no need for a trustdb check\n"
msgstr "není nutné kontrolovat databázi důvěry\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "další kontrola databáze důvěry v %s\n"
@@@ -7269,7 -5836,6 +7356,7 @@@ msgstr "žádný absolutně důvěryhod
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7277,28 -5843,22 +7364,28 @@@ msgstr "
"hloubka: %d platných: %3d podepsaných: %3d důvěra: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, 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"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "nedefinována"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "žádná"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "částečná"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "plná"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "absolutní"
@@@ -7310,40 -5870,31 +7397,40 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "14 překladateli, podívej se na trustdb.c:uid_trust_string_fixed"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ revokován ]"
# TODO: use context to distinguish gender
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[ prošlý(á) ]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ neznámá ]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[nedefinovaná]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[ částečná ]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ plná ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ absolutní ]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7353,12 -5904,10 +7440,12 @@@ msgstr "
"Prosím, nezapomeňte, že soubor s podpisem (.sig nebo .asc)\n"
"by měl být prvním souborem zadaným na příkazové řádce.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "vstupní řádek %u je příliš dlouhý nebo na konci chybí znak LF\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "nemohu otevřít deskriptor %d: %s\n"
@@@ -7686,7 -6167,6 +7773,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:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
@@@ -7824,9 -6274,6 +7911,9 @@@ msgstr "počet odpovídajících certif
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "hledání klíče pouze ve vyrovnávací paměti dirmngr neuspělo: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "alokace popisovače keyDB se nezdařila\n"
@@@ -8314,7 -6656,6 +8401,7 @@@ msgstr "(toto nevypadá jako zašifrova
msgid "certificate '%s' not found: %s\n"
msgstr "certifikát „%s“ nebyl nenalezen: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "chyba při zamykání schránky na klíče: %s\n"
@@@ -8338,123 -6675,93 +8425,123 @@@ msgstr "smazání certifikátu „%s�
msgid "no valid recipients given\n"
msgstr "(nebyli zadáni Žádní platní příjemci)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "vypsat seznam externích klíčů"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "vypsat řetěz certifikátů"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "importovat certifikáty"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "exportovat certifikáty"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "zaregistrovat čipovou kartu"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "předat příkaz do dirmngr"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "vyvolat gpg-protect-tool"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "vytvářet výstup zakódovaný pomocí Base-64"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "předpokládat vstup ve formátu PEM"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "předpokládat vstup ve formátu Base-64"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "předpokládat vstup v binárním formátu"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "nikdy nenahlížet do CRL"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "kontrolovat platnost pomocí OCSP"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|počet certifikátů, které zahrnout"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|SOUBOR|vzít politiky ze SOUBORU"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "nekontrolovat politiky certifikátu"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "stahovat chybějící certifikáty vydavatelů"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "vůbec nepoužívat terminál"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|SOUBOR|zapisovat protokol režimu server do SOUBORU"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|SOUBOR|zapisovat auditní protokol do SOUBORU"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "dávkový režim: nikdy se neptat"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "předpokládat ano na většinu otázek"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "předpokládat ne na většinu otázek"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|SOUBOR|přidat klíčenku na seznam klíčenek"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ID_UŽIVATELE|použít ID_UŽIVATELE jako implicitní tajný klíč"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|použít tento server pro dohledávání klíčů"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NÁZEV|použít šifrovací algoritmus NÁZEV"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NÁZEV|použít hashovací algoritmus NÁZEV"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Použití: @GPGSM@ [možnosti] [soubory] (-h pro pomoc)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8464,46 -6771,37 +8551,46 @@@ msgstr "
"Podepisuje, ověřuje, šifruje nebo dešifruje pomocí protokolu S/MIME.\n"
"Výchozí operace závisí na vstupních datech.\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Poznámka: nebude možné šifrovat pro „%s“: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "neznámý model ověřování „%s“\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: nebyl zadán název stroje\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: zadáno heslo bez uživatele\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: přeskakuji tento řádek\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "nelze rozebrat serveru klíčů\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importují se běžné certifikáty „%s“\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nelze podepsat pomocí „%s“: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
@@@ -8520,7 -6815,6 +8607,7 @@@ msgstr "chyba při ukládání certifik
msgid "basic certificate checks failed - not imported\n"
msgstr "základní kontrola certifikátu selhala – neimportováno\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "chyba při získání uložených příznaků: %s\n"
@@@ -8535,31 -6827,25 +8622,31 @@@ msgstr "chyba při importování certif
msgid "error reading input: %s\n"
msgstr "chyba při čtení vstupu: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "otisk se nepodařilo získat\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "problém při hledání existujícího certifikátu: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "chyba při hledání zapisovatelné keyDB: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "chyba při ukládání certifikátu: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "problém při opakovaném hledání certifikátu: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "chyba při ukládání příznaků: %s\n"
@@@ -8747,7 -7000,6 +8834,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
msgid "certificate already cached\n"
msgstr "certifikát již v keši\n"
@@@ -8755,8 -7006,6 +8842,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:384
++#: dirmngr/dirmngr-client.c:390
#, c-format
msgid "error caching certificate: %s\n"
msgstr "chyba při ukládání certifikátu do keše: %s\n"
@@@ -9355,11 -7481,9 +9442,11 @@@ msgstr "očekává certifikáty ve form
msgid "force the use of the default OCSP responder"
msgstr "vynutí použití výchozího OCSP odpovídače"
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9371,77 -7495,61 +9458,77 @@@ 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:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, 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:289
++#: dirmngr/dirmngr-client.c:295
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:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, c-format
msgid "lookup failed: %s\n"
msgstr "hledání selhalo: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "zavádění CRL „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr "démon dirmngr běží\n"
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "ověření platnosti certifikátu selhalo: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
msgid "certificate is valid\n"
msgstr "certifikát je platný\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
msgid "certificate has been revoked\n"
msgstr "certifikát byl odvolán\n"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, c-format
msgid "certificate check failed: %s\n"
msgstr "kontrola certifikátu selhala: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr "obdržen status: „%s“\n"
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "nepodporovaný dotaz „%s“\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr "očekáván absolutní název souboru\n"
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr "hledá se „%s“\n"
@@@ -9587,12 -7661,10 +9674,12 @@@ msgstr "použití: %s [volby]
msgid "colons are not allowed in the socket name\n"
msgstr "dvojtečky v názvu socketu jsou nepřípustné\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "stahování CRL z „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "zpracování CRL z „%s“ selhalo: %s\n"
@@@ -10069,76 -8039,60 +10156,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:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "volání assuan_inquire(%s) selhalo: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr "chybí ldapserver (LDAP server)"
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr "v ID certifikátu chybí serialno (sériové číslo)"
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "volání assuan_inquire selhalo: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "volání fetch_cert_by_url selhalo: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, c-format
msgid "error sending data: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "volání start_cert_fetch selhalo: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "volání fetch_next_cert selhalo: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies (max. odpovědí) %d překročeno\n"
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "řídící strukturu nelze alokovat: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "alokace kontextu assuan selhala: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "inicializace serveru selhala: %s\n"
- #: dirmngr/server.c:2438
++#: dirmngr/server.c:2437
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "registrace příkazu u Assuanu selhala: %s\n"
- #: dirmngr/server.c:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problém příjmu Assuanu: %s\n"
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "zpracování Assuanu se nezdařilo: %s\n"
diff --cc po/da.po
index 13eac69,7e6ff4b..c6c99db
--- a/po/da.po
+++ b/po/da.po
@@@ -14,7 -14,6 +14,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2012-11-01 20:27+0200\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@@ -122,8 -106,6 +122,8 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Adgangsfrase:"
@@@ -173,25 -144,11 +173,25 @@@ msgstr "Ugyldig adgangsfrase
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "kan ikke oprette »%s«: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr "Indsæt venligst kortet med serielnummeret"
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
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"
@@@ -420,8 -338,6 +420,8 @@@ msgstr "Indtast venligst adgangsfrasen
msgid "Please enter the new passphrase"
msgstr "Indtast venligst den nye adgangsfrase"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -429,138 -345,100 +429,138 @@@ msgstr "
"@Indstillinger:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 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:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "kør i servertilstand (forgrunden)"
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "uddybende"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "vær mindre uddybende"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "kommandoresultat i sh-stil"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "kommandoresultat i csh-stil"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "frakobl ikke fra konsollen"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "fang ikke tastatur og mus"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "brug en logfil for serveren"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|brug PGM som PIN-Entry-program"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|brug PGM som SCdaemon-program"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "brug ikke SCdaemon'en"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|connect to Assuan socket NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|forbind til Assuansokkel NAVN"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "ignorer forespørgsler om at ændre TTY'en"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "ignorer forespørgsler om at ændre X-skærmen"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "brug ikke PIN-mellemlageret når der underskrives"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "tillad ikke genbrug af gamle adgangsfraser"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
#, fuzzy
#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
msgstr "tillad klienter at markere nøgler som »trusted« (troværdige)"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "tillad forhåndsindstilling af adgangsfrase"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "aktiver ssh-agent-emulering"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr ""
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -572,150 -450,118 +572,156 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: 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:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() mislykkedes: %s\n"
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "mappe »%s« oprettet\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
+
++#: agent/gpg-agent.c:1964
#, 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:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, 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:2314
++#: agent/gpg-agent.c:2322
#, 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:2387
++#: agent/gpg-agent.c:2395
#, 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:2392
++#: agent/gpg-agent.c:2400
#, 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:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -731,8 -575,6 +737,8 @@@ msgstr "
"Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
"Adgangskode for mellemlagervedligeholdelse\n"
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -740,9 -582,6 +746,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -752,11 -591,9 +758,11 @@@ msgstr "
"Tilvalg:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Brug: gpg-protect-tool [tilvalg] (-h for hjælp)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -764,17 -601,14 +770,17 @@@ msgstr "
"Syntaks: gpg-protect-tool [tilvalg] [parametre]\n"
"Vedligeholdelsesværktøj for hemmelig nøgle\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
"Indtast venligst adgangsfrasen for at fjerne beskyttelsen på PKCS#12-"
"objektet."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -782,7 -616,6 +788,7 @@@ msgstr "
"Indtast venligst adgangsfrasen for at beskytte det importeret objekt inden i "
"GnuPG-systemet."
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -790,11 -623,9 +796,11 @@@ msgstr "
"Indtast venligst adgangsfrasen eller PIN'en\n"
"krævet for at færdiggøre denne handling."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "afbrudt\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrasen: %s\n"
@@@ -866,8 -687,6 +872,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "Nej"
@@@ -899,12 -715,10 +905,12 @@@ msgstr "Korrekt
msgid "Wrong"
msgstr "Forkert"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr "Bemærk: Denne adgangsfrase er aldrig blevet ændret.%0AÆndr den nu."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@@ -913,15 -727,12 +919,15 @@@ msgstr "
"Denne adgangsfrase er ikke blevet ændret%%0Asiden %.4s-%.2s-%.2s. Ændr den "
"nu."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "Ændr adgangsfrasen"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "Jeg ændrer den senere"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -929,19 -740,16 +935,19 @@@
"%%0A?"
msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "aktiver nøgle"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA kræver at hashlængden skal gå op i 8 bit\n"
@@@ -983,57 -784,47 +989,62 @@@ msgstr "beskyttelsesalgoritme %d%s er i
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "beskyttelsesalgoritme %d%s er ikke understøttet\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "fejl ved oprettelse af datakanal: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error creating a stream for a pipe: %s\n"
msgstr "fejl ved oprettelse af datakanal: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "fejl ved forgrening af proces: %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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
#| msgid "error running `%s': probably not installed\n"
msgid "error running '%s': probably not installed\n"
msgstr "fejl ved kørsel af »%s«: sikkert ikke installeret\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
msgstr "fejl ved kørsel af »%s«: termineret\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "fejl ved indhentelse af afslutningskode for proces %d: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -1047,15 -836,17 +1058,21 @@@ msgstr "kommunikationsproblem med gpg-a
msgid "problem setting the gpg-agent options\n"
msgstr "problem ved angivelse af indstillinger for gpg-agent\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "afbrudt af brugeren\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "problem med agenten\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problem med agenten: %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "kan ikke slå kernedump fra: %s\n"
@@@ -1125,18 -902,19 +1142,23 @@@ msgstr "ikke nok kerne i sikker hukomme
msgid "out of core while allocating %lu bytes"
msgstr "ikke nok kerne under allokering af %lu byte"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "fejl ved allokering af nok hukommelse: %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, 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\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1439,7 -1150,6 +1461,7 @@@ msgstr "tilvalg »%.50s« er tvetydigt\
msgid "command \"%.50s\" is ambiguous\n"
msgstr "kommando »%.50s« er tvetydig\n"
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "uden for kerne\n"
@@@ -1448,23 -1157,15 +1470,18 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "ugyldigt tilvalg »%.50s«\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "du fandt en fejl ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' not available\n"
msgid "conversion from '%s' to '%s' not available\n"
msgstr "konvertering fra »%s« til »%s« er ikke tilgængelig\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open mislykkedes: %s:\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "conversion from '%s' to '%s' failed: %s\n"
@@@ -1507,85 -1201,71 +1524,91 @@@ msgstr "lås »%s« er ikke udført: %s
msgid "waiting for lock %s...\n"
msgstr "venter på lås %s ...\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "panser: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "ugyldigt panserhoved: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "panserhoved: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "ugyldigt clearsig-hoved\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "ukendt panserhoved: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "indlejrede underskrifter i klartekst\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "uventet panser: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "ugyldig striplet undvegen linje: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "ugyldigt radix64-tegn %02x udeladt\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "for tidlig eof (ingen CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "for tidlig eof (i CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "ugyldig udformet CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-fejl; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "for tidlig eof (i trailer)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "fejl i trailerlinje\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "ingen gyldige OpenPGP-data fundet.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ugyldigt panser: linje længere end %d tegn\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"citeret udskrivingstegn i panser - måske på grund af en fejlbehæftet MTA\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "kan ikke læses af mennesker"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1593,82 -1273,72 +1616,94 @@@ msgstr "
"et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
"sluttes med et »=«\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "et brugernotationsnavn skal indeholde tegnet »@«\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "et notationsnavn må ikke indeholde mere end et »@«-tegn\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "et notationsnavn må ikke indeholde mere end et »@«-tegn\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
+ "sluttes med et »=«\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "ADVARSEL: Ingen notationsdata fundet\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "kan ikke læses af mennesker"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "kunne ikke proxy %s-forespørgsel til klient\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
#, fuzzy
#| msgid "Enter passphrase\n"
msgid "Enter passphrase: "
msgstr "Indtast adgangsfrase\n"
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "ADVARSEL: %s overskriver %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnr. %s detekteret\n"
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "kan ikke udføre dette i jobtilstand\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "Denne kommando er kun tilgængelig for version 2-kort\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Dit valg? "
@@@ -1730,21 -1386,11 +1765,16 @@@ msgstr "Adresse hvor offentlig nøgle s
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Fejl: Adresse er for lang (begrænsningen er %d tegn).\n"
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -1845,13 -1472,10 +1875,13 @@@ msgstr "Hvilken nøglestørrelse ønske
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:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: 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:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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"
@@@ -1912,9 -1526,6 +1942,9 @@@ msgstr " (2) Krypteringsnøgle\n
msgid " (3) Authentication key\n"
msgstr " (3) Godkendelsesnøgle\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Ugyldigt valg.\n"
@@@ -1950,7 -1555,6 +1980,7 @@@ msgstr "Underskriv? (j/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "afslut denne menu"
@@@ -1958,7 -1561,6 +1988,7 @@@
msgid "show admin commands"
msgstr "vis administratorkommandoer"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "vis denne hjælpetekst"
@@@ -2034,124 -1618,95 +2064,124 @@@ msgstr "Administratorkommandoer er till
msgid "Admin commands are not allowed\n"
msgstr "Administratorkommandoer er ikke tilladt\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Ugyldig kommando (prøv »help«)\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output virker ikke for denne kommando\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "kan ikke åbne »%s«\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "nøglen »%s« blev ikke fundet: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fejl ved læsning af nøgleblok: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(med mindre du angiver nøglen med fingeraftryk)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
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:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "Slet denne nøgle fra nøgleringen? (j/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Dette er en hemmelig nøgle! - Slet? (j/N) "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, 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:198
++#: g10/delkey.c:197
msgid "key"
msgstr ""
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Pubkey: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "sletning af nøgleblok mislykkedes: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "information om ejertroværdighed ryddet\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "kan ikke bruge en symmetrisk ESK-pakke på grund af S2K-tilstanden\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "bruger chiffer %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "»%s« allerede komprimeret\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ADVARSEL: »%s« er en tom fil\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "læser fra »%s«\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2159,7 -1714,6 +2189,7 @@@ msgstr "
"ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
"præferencer\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2168,40 -1722,33 +2198,40 @@@ msgstr "
"ADVARSEL: Tvang for komprimeringsalgoritme %s (%d) overtræder modtagerens "
"præferencer\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"tvang for symmetrisk chiffer %s (%d) overtræder modtagerens præferencer\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "du kan ikke bruge %s i tilstanden %s\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypteret for: »%s«\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "du kan ikke bruge %s i tilstanden %s\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s krypterede data\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "krypteret med ukendt algoritme %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ADVARSEL: Besked blev krypteret med en svag nøgle i den symmetriske "
"chiffer.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problem ved håndtering af krypteret pakke\n"
@@@ -2263,134 -1799,106 +2293,134 @@@ 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:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "eksportunderskrifter som er markeret som kun lokale"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr "bruger-id'er for eksportattributter (normalt billed-id'er)"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "tilbagekaldsnøgler for eksport markeret som »sensitive«"
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "fjern nøgledele der ikke kan bruges under eksport"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr "fjern så meget som muligt fra nøglen under eksport"
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: udelod: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "eksport af hemmelige nøgler er ikke tilladt\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "nøgle %s: nøglemateriale på kort - udeladt\n"
- #: g10/export.c:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: intet blev eksporteret\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "fejl ved oprettelse af »%s«: %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[Bruger-id blev ikke fundet]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, 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:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "fejl ved lukning af %s: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, 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:1423
++#: g10/getkey.c:1427
#, 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:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "Ingen fingeraftryk"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "opret en underskrift"
@@@ -2398,11 -1905,9 +2428,11 @@@
msgid "make a clear text signature"
msgstr "opret en underskrift i klartekst"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "opret en separat underskrift"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "krypter data"
@@@ -2410,15 -1914,12 +2440,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "krypter kun med symmetrisk chiffer"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "afkrypter data (standard)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "godkend en underskrift"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "vis nøgler"
@@@ -2430,15 -1929,12 +2460,15 @@@ msgstr "vis nøgler og underskrifter
msgid "list and check key signatures"
msgstr "vis og kontroller nøgleunderskrifter"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "vis nøgler og fingeraftryk"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "vis hemmelige nøgler"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "opret et nyt nøglepar"
@@@ -2462,7 -1954,6 +2492,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "opret et tilbagekaldscertifikat"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "fjern nøgler fra den offentlige nøglering"
@@@ -2494,7 -1979,6 +2524,7 @@@ msgstr "underskriv en nøgle lokalt
msgid "sign or edit a key"
msgstr "underskriv eller rediger en nøgle"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "ændr en adgangsfrase"
@@@ -2542,23 -2015,18 +2572,23 @@@ msgstr "opdater troværdighedsdatabasen
msgid "print message digests"
msgstr "vis beskedsammendrag"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "kør i servertilstand"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "opret ascii-pansrede uddata"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|krypter for BRUGER-ID"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
@@@ -2570,11 -2036,9 +2600,11 @@@ msgstr "|N|sæt komprimeringsniveauet t
msgid "use canonical text mode"
msgstr "brug kanonisk teksttilstand"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv resultat til FIL"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "lav ingen ændringer"
@@@ -2586,7 -2048,6 +2616,7 @@@ msgstr "spørg før overskrivning
msgid "use strict OpenPGP behavior"
msgstr "brug streng OpenPGP-opførsel"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2594,7 -2055,6 +2624,7 @@@ msgstr "
"@\n"
"(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2614,14 -2074,12 +2644,14 @@@ msgstr "
" --list-keys [navne] vis nøgler\n"
" --fingerprint [navne] vis fingeraftryk\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2636,7 -2094,6 +2666,7 @@@ msgstr "
"Sign, check, encrypt eller decrypt\n"
"standardhandling afhænger af inddata\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2644,81 -2101,66 +2674,81 @@@ msgstr "
"\n"
"Understøttede algoritmer:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "brug: gpgsm [tilvalg] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "kommandoer er i konflikt\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2727,19 -2169,16 +2757,19 @@@ msgid "
msgstr ""
"ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2749,510 -2188,399 +2779,510 @@@ msgid "
msgstr ""
"ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "ukendt konfigurationspunkt »%s«\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "vis billed-id'er under nøglevisninger"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, 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:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "vil politikadresser under underskriftvisninger"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "vis alle notationer under underskriftvisninger"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "vis IETF-standardnotationer under underskriftvisninger"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "vis brugerangivne notationer under underskriftvisninger"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "vis bruger-id-validitet under nøglevisninger"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
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:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "vis nøgleringsnavnet i nøglevisninger"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "vis udløbsdatoer under underskriftvisninger"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Tilgængelige nøgler:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "ukendt tilvalg »%s«\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
#| msgid "unknown command `%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "ukendt kommando »%s«\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, 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:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, 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:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke fortolke nøgleserveradresse\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importindstillinger\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "ugyldige importindstillinger\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportindstillinger\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "ugyldige eksportindstillinger\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listeindstillinger\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "ugyldige listeindstillinger\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "vis billed-id'er under underskriftverificering"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "vis politikadresser under underskriftverificering"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "vis alle notationer under underskriftverificering"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "vis IETF-standardnotationer under underskriftverificering"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "vis brugerangivne notationer under underskriftverificering"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "vis bruger-id-validitet under underskriftverificering"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
msgid "show only the primary user ID in signature verification"
msgstr "vis kun den primære bruger-id i underskriftverificering"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "valider underskrifter med PKA-data"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke angive kørselssti til %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: program kan oprette en kernefil!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overskriver %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsløs sammen med %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kører med forfalsket systemtid: "
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt chifferalgoritme er ugyldig\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "valgt sammendragsalgoritme er ugyldig\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed skal være større end 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed skal være større end 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "ugyldige standardpræferencer\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "ugyldige præferencer for personlig chiffer\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "ugyldige præferencer for personlig sammendrag\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "ugyldige præferencer for personlig komprimering\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker endnu ikke med %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TrustDB: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [filnavn]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, 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:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
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:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
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:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key bruger-id"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key bruger-id"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruger-id [kommandoer]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd <bruger-id>"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nøgleserver send mislykkedes: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nøgleserver modtag mislykkedes: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "nøgleeksport mislykkedes: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "nøgleeksport mislykkedes: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nøgleserver søg mislykkedes: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "nøgleserver opdater mislykkedes: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af panser mislykkedes: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "påklædning af panser mislykkedes: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ugyldig hash-algoritme »%s«\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, 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:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[filnavn]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Gå til sagen og skriv meddelelsen ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@@ -3264,7 -2590,6 +3294,7 @@@ msgstr "|FILE|tag nøglerne fra nøgler
msgid "make timestamp conflicts only a warning"
msgstr "giv kun tidsstempelkonflikter en advarsel"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation til denne FD"
@@@ -3290,128 -2611,102 +3320,128 @@@ msgstr "Ingen hjælp tilgængelig
msgid "No help available for '%s'"
msgstr "Ingen hjælp tilgængelig for »%s«"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "importer underskrifter som er markeret som local-only"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "reparer skade fra pks-nøgleserveren under import"
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "opdater ikke trustdb efter import"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "opdater ikke trustdb efter import"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "accepter kun opdateringer til eksisterende nøgler"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "fjern ubrugelige dele fra nøgle efter import"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "fjern så meget som muligt fra nøgle efter import"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr " udelader bloktype %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr " %lu-nøgler behandlet\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Totalt antal behandl.: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " udeladte nye nøgler: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " udeladte nye nøgler: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " w/o bruger-id'er: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importerede: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " uændrede: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nye bruger-id'er: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nye undernøgler: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " nye underskrifter: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nye nøgletilbagekald: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " hemmelige nøgler læst: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " hemmel. nøgler import: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "hemmel. nøgler uændret: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ikke importerede: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " underskrifter ryddet: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " bruger-id'er ryddet: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3420,201 -2715,161 +3450,201 @@@ msgstr "
"ADVARSEL: nøgle %s indeholder præferencer for utilgængelige\n"
"algoritmer på disse bruger-id'er:\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " »%s«: præference for chifferalgoritme %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " »%s«: præference for sammendragsalgortime %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " »%s«: præference for komprimeringsalgortime %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "det anbefales på det stærkeste, at du opdaterer dine præferencer og\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"gendistribuerer denne nøgle for at undgå potentielle problemer med rod i\n"
"algoritmen\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "du kan opdatere dine præferencer med: gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "nøgle %s: ingen bruger-id\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "udelod »%s«: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "nøgle %s: korruption af PKS-undernøgle er repareret!\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "nøgle %s: accepteret ikke egenunderskrevet bruger-id »%s«\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nøgle %s: ingen gyldige bruger-id'er\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "dette kan skyldes en manglende egenunderskrift\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nøgle %s: offentlig nøgle blev ikke fundet: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "nøgle %s: ny nøgle - udeladt\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ingen skrivbar nøglering fundet: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nøgle %s: offentlig nøgle »%s« importeret\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "nøgle %s: stemmer ikke med vores kopi\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nøgle %s: »%s« 1 ny bruger-id\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nøgle %s: »%s« 1 ny underskrift\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nøgle %s: »%s« %d nye underskrifter\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nøgle %s: »%s« 1 ny undernøgle\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nøgle %s: »%s« %d nye undernøgler\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nøgle %s: »%s« %d underskrift renset\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nøgle %s: »%s« %d underskrifter renset\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nøgle %s: »%s« %d bruger-id renset\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nøgle %s: »%s« ikke ændret\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nøgle %s: hemmelig nøgle importeret\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, 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:1684
++#: g10/import.c:1683
#, 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:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "import af hemmelige nøgler er ikke tilladt\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3629,204 -2884,187 +3659,229 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nøgle %s: »%s« tilbagekaldscertifikat importeret\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "nøgle %s: ingen bruger-id for underskrift\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nøgle %s: ugyldig direkte nøgleunderskrift\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nøgle %s: ugyldig undernøglebinding\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nøgle %s: fjernet flerundernøglebinding\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nøgle %s: fjernet flerundernøgletilbagekald\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nøgle %s: udeladt bruger-id »%s«\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nøgle %s: udeladt undernøgle\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - udeladt\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nøgle %s: »%s« tilbagekaldscertifikat tilføjet\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
#| msgid "error creating keybox `%s': %s\n"
msgid "error creating keybox '%s': %s\n"
msgstr "fejl ved oprettelse af nøgleboks »%s«: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
#| msgid "keybox `%s' created\n"
msgid "keybox '%s' created\n"
msgstr "nøgleboks »%s« oprettet\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "nøglering »%s« oprettet\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "nøgleblokressource »%s«: %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, 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:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "kunne ikke genbygge nøgleringsmellemlager: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[tilbagekald]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[egenunderskrift]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d ugyldige underskrifter\n"
- msgstr[1] "%d ugyldige underskrifter\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "Good signature from"
+ msgid " (reordered signatures follow)"
+ msgstr "God underskrift fra"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "skipped \"%s\": %s\n"
+ msgid "key %s:\n"
+ msgstr "udelod »%s«: %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
+ msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3834,23 -3072,26 +3889,30 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
msgstr[1] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
- msgstr[1] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d ugyldige underskrifter\n"
+ msgstr[1] "%d ugyldige underskrifter\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d bruger-id'er uden gyldige egenunderskrifter detekteret\n"
- msgstr[1] "%d bruger-id'er uden gyldige egenunderskrifter detekteret\n"
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "God underskrift fra"
+ msgstr[1] "God underskrift fra"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3861,17 -3102,14 +3923,17 @@@ msgstr "
"andre brugers nøgler\n"
"(ved at kigge på pas, kontrollere fingeraftryk fra andre kilder etc.)\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Marginal troværdighed\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Fuld troværdighed\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3881,52 -3119,40 +3943,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:501
++#: g10/keyedit.c:1014
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:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Bruger-id »%s« er tilbagekaldt."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Kunne ikke underskrive.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Bruger-id »%s« er udløbet."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Bruger-id »%s« er ikke egenunderskrevet."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Bruger-id »%s« kan underskrives. "
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "Underskriv? (j/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3935,11 -3161,9 +3997,11 @@@ msgstr "
"Egenunderskriften på »%s«\n"
"er en underskrift i PGP 2.x-stil.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3948,12 -3172,10 +4010,12 @@@ msgstr "
"Din aktuelle underskrift på »%s«\n"
"er udløbet.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3962,45 -3184,36 +4024,45 @@@ msgstr "
"Din aktuelle underskrift på »%s«\n"
"er en lokal underskrift.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "»%s« var allerede underskrevet af nøgle %s\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Ønsker du at underskrive den igen alligevel? (j/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Intet at underskrive med nøgle %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Denne nøgle er udløbet!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, 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:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4011,33 -3224,27 +4073,33 @@@ msgstr "
"faktisk tilhører personen navngivet ovenfor? Hvis du ikke kender svaret, så "
"indtast »0«.\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jeg vil ikke svare.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, 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:953
++#: g10/keyedit.c:1466
#, 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:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
#, 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:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4046,237 -3253,179 +4108,233 @@@ msgstr "
"Er du sikker på, at du ønsker at underskrive denne nøgle\n"
"med din nøgle »%s« (%s)\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Dette vil være en egenunderskrift.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "Underskriften vil blive markeret som ikke at kunne eksporteres.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "Underskriften vil blive markeret som ikke at kunne tilbagekaldes.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "Jeg har overhovedet ikke kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "Jeg har overfladisk kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "Jeg har omhyggeligt kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Underskriv? (j/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "underskrift mislykkedes: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
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:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "flytter en nøgleunderskrift til det korrekte sted\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "gem og afslut"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
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:1389
++#: g10/keyedit.c:1854
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Indtst nøglegrebet: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "vis nøgle og bruger-id'er"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "vælg bruger-id N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "vælg undernøgle N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "kontroller underskrifter"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"underskriv valgte bruger-id'er [* se nedenfor for relaterede kommandoer]"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "underskriv valgte bruger-id'er lokalt"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "underskriv valgte bruger-id'er med en troværdighedsunderskrift"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
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:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "tilføj bruger-id"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "tilføj billed-id"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "slet valgte bruger-id'er"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "tilføj en undernøgle"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "tilføj en nøgle til et smartkort"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "flyt en nøgle til et smartkort"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "flyt en sikkerhedskopinøgle til et smartkort"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "slet valgte undernøgler"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "tilføj en tilbagekaldsnøgle"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "slet underskrifter fra de valgte bruger-id'er"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
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:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "marker den valgte bruger-id som primær"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "vis præferencer (ekspert)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "vis præferencer (uddybende)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "angiv præferenceliste for de valgte bruger-id'er"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
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:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "angiv en notation for de valgte bruger-id'er"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "ændr adgangsfrasen"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "ændr ejertroværdigheden"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "tilbagekald underskrifter på de valgte bruger-id'er"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "tilbagekald valgte bruger-id'er"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "tilbagekald nøgle eller valgte undernøgler"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "aktiver nøgle"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "deaktiver nøgle"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "vis valgte billed-id'er"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
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:1465
++#: g10/keyedit.c:1931
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:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Hemmelig nøgle er tilgængelig.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Har brug for den hemmelige nøgle for dette.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4297,257 -3446,205 +4355,263 @@@ msgstr "
"tnrsign\n"
" etc.).\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Nøglen er tilbagekaldt."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, 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:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Fif: Vælg bruger-id'erne at underskrive\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Ukendt underskrifttype »%s«\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Du skal vælge mindst en bruger-id.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Du kan ikke slette den sidste bruger-id!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Vil du virkelig fjerne alle valgte bruger-id'er? (j/N) "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "Vil du virkelig flytte den primære nøgle? (j/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Du skal vælge præcis en nøgle.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "Kommando forventer en filnavnsparameter\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, 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:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Du skal vælge mindst en nøgle.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
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:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vil du virkelig slette denne nøgle? (j/N) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Vil du virkelig tilbagekalde alle valgte bruger-id'er? (j/N) "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "Vil du virkelig tilbagekalde dette bruger-id? (j/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
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:2099
++#: g10/keyedit.c:2565
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:2101
++#: g10/keyedit.c:2567
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vil du virkelig tilbagekalde denne undernøgle? (j/N) "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
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:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Angiv præferenceliste til:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Opdater præferencerne? (j/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Gem ændringer? (j/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Afslut uden at gemme? (j/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "opdatering mislykkedes: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "ugyldig fingeraftryk"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, 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:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "ugyldig værdi\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Ingen sådan bruger-id.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, 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:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Sammendrag: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Funktioner: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "Nøgleserver no-modify"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Fortrukken nøgleserver: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "Notationer: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(sensitiv)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "oprettet: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "tilbagekaldt: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "udløbet: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "udløber: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "brug: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "kortnr.: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "troværdighed: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "validitet: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Denne nøgle er blevet deaktiveret"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4555,17 -3652,12 +4619,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "tilbagekaldt"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "udløbet"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4573,17 -3665,14 +4637,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4593,35 -3682,27 +4657,35 @@@ msgstr "
"medføre at\n"
" nogle version af PGP afviser denne nøgle.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
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:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Slet denne gode underskrift? (j/N/a)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Slet denne ugyldige underskrift? (j/N/a)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Slet denne ukendte underskrift? (j/n/a)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Virkelig slette denne egenunderskrift? (j/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4629,20 -3710,16 +4693,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Slettede %d underskrift.\n"
msgstr[1] "Slettede %d underskrift.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Intet slettet.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "ugyldig"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Bruger-id »%s« komprimeret: %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4650,17 -3727,14 +4714,17 @@@ msgid_plural "User ID \"%s\": %d signat
msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Bruger-id »%s«: allerede minimeret\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Bruger-id »%s«: allerede ryddet\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4670,41 -3744,33 +4734,41 @@@ msgstr "
"tilbagekalder\n"
" kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
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:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4715,229 -3781,179 +4779,229 @@@ msgstr "
"Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
"tilbagekalder? (j/N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, 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:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Vælg venligst præcis en bruger-id.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
- #: g10/keyedit.c:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "Indtast din foretrukne nøglerserveradresse: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
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:4557
++#: g10/keyedit.c:5181
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:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "Indtast notationen: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "Fortsæt? (j/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen bruger-id med indeks %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen bruger-id med hash %s\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen undernøgle med indeks %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "bruger-id: »%s«\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (kan ikke eksporteres)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denne underskrift udløb den %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
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:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "Ikke underskrevet af dig.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (kan ikke tilbagekaldes)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "tilbagekaldt af din nøgle %s på %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "ingen hemmelig nøgle\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Nøgle %s er allerede tilbagekaldt.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Viser %s billed'id med størrelse %ld for nøgle %s (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
msgstr "præference »%s« duplikeret\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "for mange chifferpræferencer\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "for mange sammendragpræferencer\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "for mange komprimeringspræferencer\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "ugyldigt punkt »%s« i præferencestreng\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "skriver direkte underskrift\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "skriver egenunderskrift\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "skriver underskrift for nøglebinding\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nøglestørrelse afrundet op til %u bit\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"ADVARSEL: Nogle OpenPGP-programmer kan ikke håndtere en DS-nøgle med denne\n"
"sammendragsstørrelse\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Underskriv"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Certificer"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Krypter"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Godkend"
@@@ -4951,108 -3967,87 +5015,108 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "UuKkGfAa"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Mulige handligner for en %s-nøgle: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "Aktuelt tilladte handlinger: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Skift evnen til at underskrive\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Skift evnen til at kryptere\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Skift evnen til at godkende\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Afsluttet\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA og RSA (standard)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA og Elgamal\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (kun underskriv)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (kun underskriv)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (kun krypter)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (kun krypter)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (angiv dine egne evner)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (angiv dine egne evner)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
#| msgid " (%d) DSA and Elgamal\n"
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA og Elgamal\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (kun underskriv)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (angiv dine egne evner)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (kun krypter)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
#| msgid " (%d) Existing key\n"
msgid " (%d) Existing key\n"
@@@ -5061,51 -4056,41 +5125,51 @@@ msgstr " (%d) Eksisterende nøgle\n
# key grip
# chiefly ( US ) See also grip the person in charge of moving and setting up camera
# tracks and scenery in a film or television studio
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "Indtst nøglegrebet: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Ikke et gyldigt nøglegreb (forventer 40 hex cifre)\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "Ingen nøgle med dette nøglegreb\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s nøgler kan være mellem %u og %u bit lange.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for undernøglen? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Ønsket nøglestørrelse er %u bit\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "afrundet op til %u bit\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5121,7 -4106,6 +5185,7 @@@ msgstr "
" <n>m = nøgle udløber om n måneder\n"
" <n>y = nøgle udløber om n år\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5137,38 -4121,30 +5201,38 @@@ msgstr "
" <n>m = underskriften udløber om n måneder\n"
" <n>y = underskriften udløber om n år\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Nøgle er gyldig for? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Underskrift er gyldig for? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "ugyldig værdi\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "Nøglen udløber aldrig\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "Underskriften udløber aldrig\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "Nøglen udløber den %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "Underskriften udløber den %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5176,11 -4152,9 +5240,11 @@@ msgstr "
"Dit system kan ikke vise datoer efter 2038.\n"
"Det vil dog blive korrekt håndteret op til 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt? (j/N) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5194,7 -4168,6 +5258,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5210,50 -4183,39 +5274,50 @@@ msgstr "
" »Heinrich Heine (digteren) <heinrichh at duesseldorf.de>«\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Fødselsnavn: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Ugyldige bogstaver i navn\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Navn må ikke starte med et tal\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Navn skal være mindst 5 bogstaver langt\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "E-post-adresse: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig e-post-adresse\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Ugyldigt tegn i kommentar\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5264,7 -4226,6 +5328,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5279,35 -4240,28 +5343,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Ret venligst fejlen først\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5319,12 -4273,10 +5383,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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nøgleoprettelse mislykkedes: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5332,71 -4284,58 +5396,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, 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:3501
++#: g10/keygen.c:3514
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Brug denne nøgle alligevel? (j/N) "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "opretter ny nøgle\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Nøgleoprettelse annulleret.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "BEMÆRK: sikkerhedskopi af kortnøgle gemt på »%s«\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5404,7 -4343,6 +5468,7 @@@ msgstr "
"Bemærk at denne nøgle ikke kan bruges til kryptering. Du kan bruge\n"
"kommandoen »--edit-key« til at oprette en undernøgle til dette formål.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5412,7 -4350,6 +5476,7 @@@ msgstr "
"nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
"urproblem)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5420,50 -4357,39 +5484,50 @@@ msgstr "
"nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
"urproblem)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
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:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Vil du virkelig oprette? (j/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "aldrig "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Kritisk underskriftspolitik: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Underskriftspolitik: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Kritisk foretrukken nøgleserver: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Kritisk underskriftnotation: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Underskriftsnotation: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5471,55 -4397,51 +5535,63 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d ugyldige underskrifter\n"
msgstr[1] "%d ugyldige underskrifter\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
+ msgstr[1] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Nøglering"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "udelod »%s«: %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Primær nøglefingeraftryk:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr "Primær nøglefingeraftryk:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Undernøglefingeraftryk:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " Nøglefingeraftryk ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " Serielnr. for kort ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "mellemlagrer nøglering »%s«\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5527,14 -4449,12 +5599,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu nøgler mellemlagret indtil nu (%lu underskrifter)\n"
msgstr[1] "%lu nøgler mellemlagret indtil nu (%lu underskrifter)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5542,58 -4462,45 +5614,58 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 ugyldig underskrift\n"
msgstr[1] "1 ugyldig underskrift\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: nøglering oprettet\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "inkluder tilbagekaldte nøgler i søgeresultater"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "inkluder undernøgler når der søges efter nøgle-id"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "hent automatisk nøgler når der verificeres underskrifter"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr "overhold den foretrukne nøglerserveradresse angivet på nøglen"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
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:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "deaktiveret"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Indtal tal, N)æste eller Q) for Afslut > "
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ugyldig nøgleserverprotokol (os %d!=håndtag %d)\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "»%s« er ikke et nøgle-id: udelader\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5601,470 -4508,376 +5673,470 @@@ msgid_plural "refreshing %d keys from %
msgstr[0] "opdaterer %d nøgler fra %s\n"
msgstr[1] "opdaterer %d nøgler fra %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "nøgle »%s« blev ikke fundet på nøgleserver\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "nøgle blev ikke fundet på nøgleserver\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "ingen kendt nøgleserver (brug tilvalget --keyserver)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "anmoder om nøgle %s fra %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "ingen nøgleserverhandling!\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "sender nøgle %s til %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, 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:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ADVARSEL: kan ikke hente URI %s: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "underlig størrelse for en krypteret sessionsnøgle (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s krypteret sessionsnøgle\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "adgangsfrase oprettet med ukendt sammendragsalgoritme %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "offentlig nøgle er %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "krypterede data for offentlig nøgle: god DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "krypteret med %u-bit %s nøgle, id %s, oprettet %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " »%s«\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "krypteret med %s nøgle, id %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "afkryptering af offentlig nøgle mislykkedes: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "krypteret med %lu adgangsfraser\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "krypteret med 1 adgangsfrase\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "antager %s krypterede data\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"IDEA-chiffer utilgængelig, forsøger optimistisk at bruge %s i stedet for\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "ADVARSEL: besked var ikke integritetsbeskyttet\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "afkryptering okay\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ADVARSEL: krypteret besked er blevet manipuleret!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "afkryptering mislykkedes: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "oprindeligt filnavn=»%.*s«\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "ADVARSEL: flere klartekster set\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "uafhængig tilbagekald - brug »gpg --import« for at anvende\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "ingen underskrift fundet\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "UGYLDIG underskrift fra »%s«"
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Udløbet underskrift fra »%s«"
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "God underskrift fra »%s«"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "underskriftverificering undertrykt\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Underskrift lavet %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " bruger %s nøgle %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Nøgle tilgængelig på: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[usikker]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " også kendt som »%s«"
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Underskrift udløbet %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Underskrift udløber %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binær"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "tekstilstand"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "ukendt"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritme: %s"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan ikke kontrollere underskrift: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "ikke en frakoblet underskrift\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "uafhængig underskrift for klasse 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "gammeldags (PGP 2.x) underskrift\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) mislykkedes i %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "ADVARSEL: bruger eksperimentel offentlig nøglealgoritme %s\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "ADVARSEL: Elgamalnøgler for underskriv+krypter er forældede\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "ADVARSEL: bruger eksperimentel chifferalgoritme %s\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "ADVARSEL: bruger eksperimentel sammendragsalgoritme %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "ADVARSEL: sammendragsalgoritme %s er forældet\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "læsefejl i »%s«: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "læsefejl i »%s«: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: forældet indstilling »%s«\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "brug venligst »%s%s« i stedet for\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Ukomprimeret"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "ukomprimeret|ingen"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "tvetydigt tilvalg »%s«\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "ukendt tilvalg »%s«\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
#, 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:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "Ukendt underskrifttype »%s«\n"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Filen »%s« findes. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Overskriv? (j/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: ukendt suffiks\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Indtast nyt filnavn"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "skriver til stdout\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "antager underskrevne data i »%s«\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "ny konfigurationsfil »%s« oprettet\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr ""
"ADVARSEL: indstillinger i »%s« er endnu ikke aktive under denne kørsel\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "kan ikke håndtere offentlig nøglealgoritme %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "ADVARSEL: potentiel usikker symmetrisk krypteret sessionsnøgle\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpakke af typen %d har kritiske bitsæt\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problem med agenten: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (hovednøgle-id %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6079,15 -4892,12 +6151,15 @@@ msgstr "
"%u-bit %s nøgle, id %s,\n"
"oprettet %s%s.\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Indtast adgangsfrase\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "afbrudt af bruger\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6096,17 -4906,14 +6168,17 @@@ msgstr "
"Du skal bruge en adgangsfrase til at åbne den hemmelige\n"
"nøgle for bruger: »%s«\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit %s nøgle, id %s, oprettet %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (undernøgle på hovednøgle-id %s)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
#| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
@@@ -6114,37 -4921,31 +6186,37 @@@ msgstr "
"Indtast venligst adgangsfrasen for at fjerne beskyttelsen på PKCS#12-"
"objektet."
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6202,31 -4995,24 +6274,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Ingen årsag angivet"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Nøglen er blevet afløst"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Nøglen er blevet komprimeret"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Nøglen bruges ikke længere"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "Bruger-id er ikke længere gyldigt"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "årsag for tilbagekald: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "tilbagekaldskommentar: "
@@@ -6241,54 -5027,43 +6313,54 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Ingen tillidsværdi tildelt til:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " også kendt som »%s«\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, 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:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Jeg stoler IKKE på denne nøgle\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Jeg stoler fuldstændig på denne nøgle\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " h = tilbage til hovedmenuen\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = udelad denne nøgle\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " a = afslut\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6297,40 -5072,32 +6369,40 @@@ msgstr "
"Minimumstroværdighedsniveau for denne nøgle er: %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Dit valg? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
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:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "Denne nøgle tilhører sikkert den navngivne bruger\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Denne nøgle tilhører os\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6340,139 -5107,111 +6412,139 @@@ 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:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "Brug denne nøgle alligevel? (j/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "ADVARSEL: Bruger nøgle uden troværdighed!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " Dette kan betyde at underskriften er forfalsket.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Bemærk: Denne nøgle er blevet deaktiveret.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, 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:589
++#: g10/pkclist.c:604
#, 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:601
++#: g10/pkclist.c:616
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:609
++#: g10/pkclist.c:624
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:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Bemærk: Denne nøgle er forældet!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ADVARSEL: Vi tror IKKE på denne nøgle!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen er formentlig FORFALSKET.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: udelod: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: udelod: offentlig nøgle er slået fra\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: udelod: offentlig nøgle er allerede til stede\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "kan ikke forbinde til »%s«: %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "linje %d: ugyldig algoritme\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "linje %d: ugyldig algoritme\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Aktuelle modtagere:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6480,168 -5219,132 +6552,168 @@@ msgstr "
"\n"
"Indtast bruger-id'et. Slut med en tom linje: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Ingen sådan bruger-id.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "udeladt: offentlig nøgle er allerede valgt som standardmodtager\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Offentlig nøgle er slået fra.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "udelod: offentlig nøgle er allerede angivet\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "ukendt standardmodtager »%s«\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "ingen gyldige adresser\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, 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:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Frakoblet underskrift.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Indtast navn for datafil: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "læser stdin ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "ingen underskrevne data\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kan ikke åbne underskrevne data fd=%d: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonym modtager; prøver hemmelig nøgle %s ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "okay, vi er den anonyme modtager.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "gammel kodning for DEK'en er ikke understøttet\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "chifferalgoritme %d%s er ukendt eller deaktiveret\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "ADVARSEL: chifferalgoritme %s ikke fundet i modtagerpræferencer\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "BEMÆRK: hemmelig nøgle %s udløb den %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet mislykkedes: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "nøgle %s har ingen bruger-id'er\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Tilbagekaldes af:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Dette er en sensitiv tilbagekaldsnøgle)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, 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
++#: g10/revoke.c:327
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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "ASCII-pansret resultat er tvunget.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet mislykkedes: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Tilbagekaldscertifikat oprettet.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "ingen tilbagekaldsnøgler fundet for »%s«\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Opret et tilbagekaldscertifikat for denne nøgle? (j/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6650,20 -5353,17 +6722,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Tilbagekaldscertifikat oprettet.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6672,22 -5372,18 +6744,22 @@@ msgstr "hemmelig nøgle »%s« blev ikk
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Opret et tilbagekaldscertifikat for denne nøgle? (j/N) "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6706,78 -5402,62 +6778,78 @@@ msgstr "
"forsigtig: Dit udskrivningssystem kan gemme dataene og gøre dem\n"
"tilgængelige for andre!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Vælg venligst årsagen for tilbagekaldet:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Afbryd"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Du vil sikkert vælge %d her)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Årsag for tilbagekald: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Ingen beskrivelse angivet)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Er dette okay? (j/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "svag nøgle oprettet - prøver igen\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "kan ikke undgå svag nøgle for symmetrisk chiffer: prøvede %d gange!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, fuzzy, c-format
#| msgid "%s key uses an unsafe (%u bit) hash\n"
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "%s-nøglen bruger en usikker (%u bit) hash\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, fuzzy, c-format
#| msgid "DSA key %s requires a %u bit or larger hash\n"
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:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "ADVARSEL: konflikt for underskriftssammendrag i besked\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "se venligst %s for yderligere information\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6785,7 -5465,6 +6857,7 @@@ msgid_plural "public key %s is %lu seco
msgstr[0] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
msgstr[1] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6793,7 -5472,6 +6865,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
msgstr[1] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6808,7 -5486,6 +6880,7 @@@ msgstr[1] "
"nøgle %s blev oprettet %lu sekund inde i fremtiden (tidsforskydning eller et "
"problem med uret)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6822,42 -5499,35 +6894,42 @@@ msgstr[1] "
"nøgle %s blev oprettet %lu sekund inde i fremtiden (tidsforskydning eller et "
"problem med uret)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, 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:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "nøgle %s: ingen undernøgle til bindingsunderskrift for undernøgle\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"ADVARSEL: kan ikke %%-udvide notation (for stor). Bruger uden udvidelse.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6865,7 -5535,6 +6937,7 @@@ msgstr "
"ADVARSEL: kan ikke %%-udvide politikadresse (for stor). Bruger uden "
"udvidelse.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6874,12 -5543,10 +6946,12 @@@ msgstr "
"ADVARSEL: kan ikke %%-udvide foretrukken nøgleserveradresse (for stor). "
"Bruger uden udvidelse.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s-underskrift fra: »%s«\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6887,40 -5554,32 +6959,40 @@@ msgstr "
"ADVARSEL: tvang af sammendragsalgoritme %s (%d) overtræder "
"modtagerpræferencer\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "underskriver:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s-kryptering vil blive brugt\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"nøgle er ikke markeret som usikker - kan ikke bruge den med falsk RNG!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "udelod »%s«: duplikeret\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "udelod: hemmelig nøgle er allerede til stede\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "stol på post %lu, type %d: skrivning mislykkedes: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6929,327 -5588,264 +7001,327 @@@ msgstr "
"# Liste over tildelte troværdige værdier, oprettede %s\n"
"# (Brug »gpg --import-ownertrust« for at gendanne dem)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error in '%s': %s\n"
msgstr "fejl i »%s«: %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "linje for lang"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "kolon mangler"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "ugyldig fingeraftryk"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "værdi for ejertroværdighed mangler"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
#| msgid "error finding trust record in `%s': %s\n"
msgid "error finding trust record in '%s': %s\n"
msgstr "fejl under forsøg på at finde troværdighedspost i »%s«: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "read error in '%s': %s\n"
msgstr "læsefejl i »%s«: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: synkronisering mislykkedes: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
#| msgid "can't create lock for `%s'\n"
msgid "can't create lock for '%s'\n"
msgstr "kan ikke oprette lås for »%s«\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
#| msgid "can't lock `%s'\n"
msgid "can't lock '%s'\n"
msgstr "kan ikke låse »%s«\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek mislykkedes: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb rec %lu: skrivning mislykkedes (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "transaktion for trustdb er for stor\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:675
+ #, c-format
+ msgid "%s: directory does not exist!\n"
+ msgstr "%s: mappe findes ikke!\n"
+
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
msgstr "kan ikke tilgå »%s«: %s\n"
- #: g10/tdbio.c:688
- #, c-format
- msgid "%s: directory does not exist!\n"
- msgstr "%s: mappe findes ikke!\n"
-
- #: g10/tdbio.c:711
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: kunne ikke oprette versionspost: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ugyldig trustdb oprettet\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trustdb oprettet\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "BEMÆRK: trustdb ikke skrivbar\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ugyldig trustdb\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: kunne ikke oprette hashtabel: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: fejl ved opdatering af versionspost: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: fejl ved læsning af versionspost: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: fejl ved skrivning af versionspost: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek mislykkedes: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: læsning mislykkedes (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ikke en trustdb-fil\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versionspost med recnum %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: ugyldig filversion %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: fejl ved læsning af fri post: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: fejl ved skrivning af mappepost: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: mislykkedes med at nulle en post: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: mislykkedes med at vedhæfte en post: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "Fejl: trustdb er ødelagt.\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "kan ikke håndtere tekstlinjer længere end %d tegn\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "inddatalinje er længere end %d tegn\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "fejl under afsendelse af standardtilvalg: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "ikke understøttet algoritme: %s"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "fejl ved skrivning af hemmelig nøglering »%s«: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: fejl ved skrivning af mappepost: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "fejl ved åbning af »%s«: %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
#| msgid "error storing flags: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "fejl ved lagring af flag: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "fejl ved indhentelse af ny PIN: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "validitet: %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "fejl ved indhentelse af gemte flag: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vis nøgler"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7257,21 -5853,18 +7329,21 @@@ msgid_plural "%ld messages signed
msgstr[0] "vis beskedsammendrag"
msgstr[1] "vis beskedsammendrag"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7281,177 -5874,158 +7353,189 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "fejl ved oprettelse af datakanal: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "vis beskedsammendrag"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "fejl under afsendelse af %s-kommando: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "nøgle %s: accepteret som troværdig nøgle\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "nøgle %s markeret som ultimativ troværdig\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
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:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr "Hvis det ikke virker, så se venligst manualen\n"
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, 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:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "bruger %s troværdighedsmodel\n"
@@@ -7460,7 -6033,6 +7544,7 @@@
msgid "no need for a trustdb check\n"
msgstr "intet behov for kontrol af trustdb\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "næste kontrol af trustdb sker den %s\n"
@@@ -7511,7 -6075,6 +7595,7 @@@ msgstr "ingen ultimativ troværdige nø
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7519,28 -6082,22 +7603,28 @@@ msgstr "
"dybde: %d gyldig: %3d underskrevet: %3d troværdighed: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "ej defineret"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "aldrig"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "marginal"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "fuld"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "ultimativ"
@@@ -7552,41 -6109,32 +7636,41 @@@
#. 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
++#: g10/trust.c:146
#, fuzzy
#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "10 oversætter se trustdb.c:uid_trust_string_fixed"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ tilb.]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[ udløbet]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ ukendt]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[ ej def]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[marginal]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ fuld ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ ultim. ]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7596,12 -6144,10 +7680,12 @@@ msgstr "
"Husk at underskriftfilen (.sig eller .asc)\n"
"skal være den første fil på kommandolinjen.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "inddatalinje %u er for lang eller mangler LF\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "kan ikke åbne fd %d: %s\n"
@@@ -7931,7 -6409,6 +8015,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:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
@@@ -8083,9 -6530,6 +8167,9 @@@ msgstr "antallet af matchende certifika
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "dirmngr cache-only-nøgleopslag mislykkedes: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "kunne ikke allokere keyDB-håndtag\n"
@@@ -8593,7 -6932,6 +8677,7 @@@ msgstr "(dette ser ikke ud til at vær
msgid "certificate '%s' not found: %s\n"
msgstr "certifikat »%s« blev ikke fundet: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "fejl ved låsning af nøgleboks: %s\n"
@@@ -8619,125 -6953,95 +8703,125 @@@ msgstr "sletning af certifikat »%s« m
msgid "no valid recipients given\n"
msgstr "ingen gyldige modtagere angivet\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "vis eksterne nøgler"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "vis certifikatkæde"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "importer certifikater"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "eksporter certifikater"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "registrer et smartkort"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "send en kommando til dirmngr'en"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "opstart gpg-protect-tool"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "opret base-64-kodet resultat"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "antag inddata er i PEM-format"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "antag inddata er i base-64-format"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "antag inddata er i binært format"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "konsulter aldrig en CRL"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "kontroller validitet med OCSP"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|antal certifikater der skal inkluderes"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|FILE|tag politikinformation fra FIL"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "kontroller ikke certifikatpolitikker"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "hent manglende udstedercertifikater"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "brug overhovedet ikke terminalen"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|FILE|skriv en servertilstandslog til FIL"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|skriv en revisionslog til FIL"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "kørselstilstand: spørg aldrig"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "forvent ja til de fleste spørgsmål"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "forvent nej til de fleste spørgsmål"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FILE|tilføj nøglering til nøgleringslisten"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|brug chifferalgoritme NAVN"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|brug beskedsammendragsalgoritme NAVN"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
@@@ -8752,50 -7056,41 +8836,50 @@@ msgstr "
"Sign, check, encrypt eller decrypt med S/MIME-protokollen\n"
"standardhandling afhænger af inddata\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "BEMÆRK: kan ikke kryptere til »%s«: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
#| msgid "unknown validation model `%s'\n"
msgid "unknown validation model '%s'\n"
msgstr "ukendt valideringsmodel »%s«\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: intet værtsnavn angivet\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: adgangskode angivet uden bruger\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: udelader denne linje\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "kunne ikke fortolke nøgleserver\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "importerer gængse certifikater »%s«\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
#| msgid "can't sign using `%s': %s\n"
msgid "can't sign using '%s': %s\n"
msgstr "kan ikke underskrive med »%s«: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "ugyldig kommando (der er ingen implict kommando)\n"
@@@ -8812,7 -7104,6 +8896,7 @@@ msgstr "fejl ved lagring af certifikat\
msgid "basic certificate checks failed - not imported\n"
msgstr "grundlæggende certifikatkontroller mislykkedes - ikke importeret\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "fejl ved indhentelse af gemte flag: %s\n"
@@@ -8827,31 -7116,25 +8911,31 @@@ msgstr "fejl under import af certifikat
msgid "error reading input: %s\n"
msgstr "fejl ved læsning af inddata: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "kunne ikke indhente fingeraftrykket\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "problem under udkig efter eksisterende certifikat: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "fejl under søgning efter skrivbar keyDB (nøgledatabase): %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "fejl ved lagring af certifikat: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "problem under gensøgning af certifikat: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "fejl ved lagring af flag: %s\n"
@@@ -9050,7 -7300,6 +9134,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
@@@ -9062,8 -7310,6 +9146,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:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
@@@ -9734,13 -7857,11 +9818,13 @@@ msgstr "eksporter certifikater
msgid "force the use of the default OCSP responder"
msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9748,90 -7869,74 +9832,90 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, 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:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "opdatering mislykkedes: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, 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:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, 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:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate is valid\n"
msgstr "certifikat er gyldigt\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
#| msgid "certificate has been revoked"
msgid "certificate has been revoked\n"
msgstr "certifikat er blevet tilbagekaldt"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, 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:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported inquiry '%s'\n"
msgstr "ikke understøttet algoritme: %s"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -10007,13 -8078,11 +10091,13 @@@ msgstr "brug: gpgsm [tilvalg]
msgid "colons are not allowed in the socket name\n"
msgstr "%s ikke tilladt med %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, 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:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
@@@ -10554,86 -8521,70 +10638,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, 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:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, 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:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, 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:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, 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:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/de.po
index 50dbef0,f5886ef..7abf2be
--- a/po/de.po
+++ b/po/de.po
@@@ -9,8 -9,7 +9,8 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
- "PO-Revision-Date: 2016-01-26 13:18+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
+ "PO-Revision-Date: 2016-05-04 11:03+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@@ -107,8 -91,6 +107,8 @@@ msgstr "
msgid "PIN:"
msgstr "PIN:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Passphrase:"
@@@ -158,24 -129,10 +158,24 @@@ msgstr "Falsche Passphrase!
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, c-format
msgid "can't create '%s': %s\n"
msgstr "'%s' kann nicht erzeugt werden: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
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:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
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 "
@@@ -376,12 -297,10 +376,12 @@@ msgstr "
"Eine Passphrase sollte kein bekanntes Wort sein oder%%0Anach bekannten "
"Regeln aufgebaut sein."
+#: agent/genkey.c:293
msgid "Warning: You have entered an insecure passphrase."
msgstr ""
- "WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben."
+ "WARNUNG: Sie haben eine offensichtlich unsichere%0APassphrase eingegeben."
+#: agent/genkey.c:480
#, c-format
msgid "Please enter the passphrase to%0Aprotect your new key"
msgstr "Bitte geben Sie die Passphrase ein,%0Aum Ihren Schlüssel zu schützen."
@@@ -390,8 -308,6 +390,8 @@@
msgid "Please enter the new passphrase"
msgstr "Bitte geben Sie die Passphrase ein:"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -399,130 -315,92 +399,130 @@@ msgstr "
"@Optionen:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "Im Daemon Modus ausführen"
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "Im Server Modus ausführen"
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "Detaillierte Informationen"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "Reduzierte Informationen"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "Ausgabe für /bin/sh"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "Ausgabe für /bin/csh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "Im Vordergrund laufen lassen"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "Tastatur und Maus nicht \"grabben\""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "Logausgaben in eine Datei umlenken"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|Benutze PGM as PIN-Entry"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|Benutze PGM als SCdaemon"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|Einige Kommandos über NAME annehmen"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "Ignoriere Anfragen, das TTY zu wechseln"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|Lasse PINs im Cache nach N Sekunden verfallen"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "Benutze PINs im Cache nicht beim Signieren"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
msgid "disallow the use of an external password cache"
msgstr "Verbiete die Verwendung eines externen Passwordmanagers"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr "Verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "Erlaube ein \"preset\" von Passphrases"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
- msgstr "Aufrufer darf das Pinentry ersetzen"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
+ msgstr "Aufrufer darf das Pinentry nicht ersetzen"
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr "Erlaube die Eingabe einer Passphrase über Emacs"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
msgid "enable ssh support"
msgstr "SSH Unterstützung einschalten"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr "PuTTY Unterstützung einschalten"
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
"Sinn- oder Schreibfehler in den deutschen Texten bitte an <de at li.org>.\n"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -530,137 -408,104 +530,142 @@@ msgstr "
"Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
"Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
- #: agent/gpg-agent.c:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "Verzeichnis `%s' erzeugt\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Zugriffsrechte für '%s' können nicht gesetzt werden: %s\n"
+
++#: agent/gpg-agent.c:1964
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, 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:2314
++#: agent/gpg-agent.c:2322
#, 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:2387
++#: agent/gpg-agent.c:2395
#, 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:2392
++#: agent/gpg-agent.c:2400
#, 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:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s angehalten\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -676,8 -519,6 +681,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
"Kennwortpuffer-Pflege\n"
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -685,9 -526,6 +690,9 @@@ msgstr "
"@Befehle:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -697,11 -535,9 +702,11 @@@ msgstr "
"Optionen:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Aufruf: gpg-protect-tool [Optionen] (-h für Hilfe)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -709,16 -545,13 +714,16 @@@ msgstr "
"Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
"Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Bitte geben Sie die Passphrase zum Entsperren des PKCS#12 Objekts ein."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
"Bitte geben Sie die Passphrase zum Schützen des neuen PKCS#12 Objekts ein."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -726,7 -559,6 +731,7 @@@ msgstr "
"Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
"System zu schützen."
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -734,11 -566,9 +739,11 @@@ msgstr "
"Die Eingabe der Passphrase bzw. der PIN\n"
"wird benötigt, um diese Aktion auszuführen."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "Vom Benutzer abgebrochen\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
@@@ -807,8 -627,6 +812,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "Nein"
@@@ -840,14 -655,12 +845,14 @@@ msgstr "Korrekt
msgid "Wrong"
msgstr "Falsch"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Hinweis: Diese Passphrase wurde noch nie geändert/%0ABitte ändern Sie sie "
"jetzt."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@@ -856,15 -669,12 +861,15 @@@ msgstr "
"Diese Passphrase wurde seit dem %.4s-%.2s-%.2s nicht%%0A\n"
"mehr geändert. Bitte ändern Sie sie jetzt."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "Die Passphrase ändern"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "Ich werde sie später ändern"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -873,11 -683,9 +878,11 @@@ msgstr "
"Möchten Sie den Schlüssel mit dem \"Keygrip\"%%0A %s%%0A %%C%%0Awirklich "
"entfernen?"
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
msgid "Delete key"
msgstr "Schlüssel löschen"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -886,7 -694,6 +891,7 @@@ msgstr "
"Das Löschen dieses Schlüssels kann Ihren Zugriff auf entfernte Rechner\n"
"behindern."
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "Für DSA muß die Hashlänge ein Vielfaches von 8 Bit sein\n"
@@@ -925,53 -725,42 +930,57 @@@ msgstr "Schutzverfahren %d (%s) wird ni
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "Schutzverfahrenshash %d (%s) wird nicht unterstützt\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "Fehler beim Erzeugen eines \"streams\" zu einer \"pipe\": %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
- #: common/exechelp-posix.c:539 common/exechelp-w32.c:702
- #: common/exechelp-w32ce.c:751
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
#, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "Das Warten auf die Beendigung von Prozessen schlug fehl: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "Fehler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, c-format
msgid "error running '%s': terminated\n"
msgstr "Fehler bei Ausführung von `%s': beendet\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
+
+#: common/simple-pwquery.c:376
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
@@@ -984,15 -771,16 +993,20 @@@ msgstr "Kommunikationsproblem mit GPG-A
msgid "problem setting the gpg-agent options\n"
msgstr "Beim Setzen der gpg-agent Optionen ist ein Problem aufgetreten\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "Vom Benutzer abgebrochen\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "Problem mit dem Agenten\n"
++#: common/simple-pwquery.c:697
+ #, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "Problem mit dem Agenten (unerwartete Antwort \"%s\")\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
@@@ -1063,17 -837,18 +1077,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: Die Option \"%s\" is veraltet - sie hat keine Wirkung\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "Unbekanntes Debug Flag '%s' wird ignoriert\n"
@@@ -1364,7 -1072,6 +1383,7 @@@ msgstr "Option \"%.50s\" ist mehrdeutig
msgid "command \"%.50s\" is ambiguous\n"
msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "Nicht genügend Speicher\n"
@@@ -1373,22 -1079,14 +1392,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "Ungültige Option \"%.50s\"\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "Sie haben einen Bug (Programmfehler) gefunden ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "Umwandlung von `%s' in `%s' ist nicht verfügbar\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open fehlgeschlagen: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
@@@ -1427,86 -1118,71 +1441,91 @@@ msgstr "Dateisperre %s konnte nicht ein
msgid "waiting for lock %s...\n"
msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "ASCII-Hülle: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "Ungültige ASCII-Hülle"
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "ASCII-Hülle: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "Ungültige Klartextsignatur-Einleitung\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "Unbekannter Header in der ASCII-Hülle: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "verschachtelte Klartextsignatur\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "Unerwartete ASCII-Hülle: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "Ungültiges \"radix64\" Zeichen %02x übersprungen\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "Falsch aufgebaute Prüfsumme\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Prüfsummenfehler; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "Fehler in der Nachsatzzeile\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"\"quoted printable\" Zeichen in der ASCII-Hülle gefunden - möglicherweise\n"
" war ein fehlerhafter Email-Transporter(\"MTA\") die Ursache\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, c-format
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "[ Nicht als Klartext darstellbar (%zu bytes: %s%s) ]"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1514,78 -1190,62 +1533,84 @@@ msgstr "
"Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
"enthalten und muß mit einem '=' enden\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen maximal einmal verwenden\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "Ein \"notation\"-Wert darf das '='-Zeichen nicht verwenden\n"
+
++#: g10/build-packet.c:1241
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
+ "enthalten\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "nicht als Klartext darstellbar"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "Die %s \"inquiry\" konnte nicht an den Client weitergeleitet werden\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Geben Sie die Passphrase ein: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, c-format
msgid "error getting version from '%s': %s\n"
msgstr "Fehler beim Holen der Version von '%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr "Der Server '%s' is älter als wir selbst (Version %s < %s)"
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, c-format
msgid "WARNING: %s\n"
msgstr "WARNUNG: %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ihre Auswahl? "
@@@ -1648,20 -1294,10 +1673,15 @@@ msgstr "URL um den öffentlichen Schlü
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "Fehler beim Schreiben von %s: %s\n"
@@@ -1759,13 -1376,10 +1779,13 @@@ msgid "What keysize do you want for th
msgstr ""
"Welche Schlüssellänge wünschen Sie für den Authentisierungs-Schlüssel? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "aufgerundet auf %u Bit\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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"
@@@ -1822,9 -1426,6 +1842,9 @@@ msgstr " (2) Verschlüsselungs-Schlü
msgid " (3) Authentication key\n"
msgstr " (3) Authentisierungs-Schlüssel\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Ungültige Auswahl.\n"
@@@ -1855,7 -1450,6 +1875,7 @@@ msgstr "Fortsetzen? (j/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Möchten Sie die Karte wirklich komplett löschen? (\"yes\" eingeben) "
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "Menü verlassen"
@@@ -1863,7 -1456,6 +1883,7 @@@
msgid "show admin commands"
msgstr "Zeige Admin-Befehle"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "Diese Hilfe zeigen"
@@@ -1939,121 -1513,92 +1959,121 @@@ msgstr "Admin-Befehle sind erlaubt\n
msgid "Admin commands are not allowed\n"
msgstr "Admin-Befehle sind nicht erlaubt\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output funktioniert nicht bei diesem Befehl\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "'%s' kann nicht geöffnet werden\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, c-format
msgid "key \"%s\" not found\n"
msgstr "Schlüssel \"%s\" nicht gefunden\n"
- #: g10/delkey.c:130 g10/delkey.c:137
++#: g10/delkey.c:129 g10/delkey.c:136
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:136
++#: g10/delkey.c:135
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:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "Diesen Schlüssel aus dem Schlüsselbund löschen? (j/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
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:196
++#: g10/delkey.c:195
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "Fehler beim Löschen des privaten %ss: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "Schlüssel"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "subkey"
msgstr "Unterschlüssel"
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "löschen des Schlüsselblocks fehlgeschlagen: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "Der \"Ownertrust\" wurde gelöscht\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
"Aufgrund des S2K-Modus kann ein symmetrisches ESK Paket nicht benutzt "
"werden\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "benutze Cipher %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, c-format
msgid "'%s' already compressed\n"
msgstr "`%s' ist bereits komprimiert\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, c-format
msgid "reading from '%s'\n"
msgstr "Lesen von '%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2061,7 -1606,6 +2081,7 @@@ msgstr "
"WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
"%s (%d) verletzt die Empfängervoreinstellungen\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2070,40 -1614,33 +2090,40 @@@ msgstr "
"WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
"Empfängervoreinstellungen.\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
"verletzt die Empfängervoreinstellungen\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, 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"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s verschlüsselt für: %s\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, 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"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s verschlüsselte Daten\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"WARNUNG: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "Problem beim Bearbeiten des verschlüsselten Pakets\n"
@@@ -2163,128 -1689,100 +2183,128 @@@ 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:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "Exportiere auch Signaturen die als nicht exportfähig markiert sind"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr "Exportiere Attribute von User-IDs (i.A. Foto-IDs)"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "Exportiere Widerrufsschlüssel die als \"sensitiv\" markiert sind"
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "Unbrauchbare Teile des Schlüssel während des Exports entfernen"
- #: g10/export.c:87
++#: g10/export.c:86
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:896
++#: g10/export.c:895
msgid " - skipped"
msgstr " - übersprungen"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "Fehler beim Erstellen von `%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[User-ID nicht gefunden]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(Prüfe das Argument der Option '%s')\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
"WARNUNG: '%s' sollte eine lange Schlüssel-ID oder ein Fingerabdruck sein\n"
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, c-format
msgid "error looking up: %s\n"
msgstr "Fehler beim Nachschlagen von: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "WARNUNG: %s ist %d mal im Schlüsselbund vorhanden\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "`%s' automatisch via %s geholt\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "Fehler beim automatischen holen von `%s' über `%s': %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "Kein Fingerabdruck vorhanden"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr ""
"WARNUNG: \"%s\" wird nicht als voreingestellter geheimer Schlüssel benutzt: "
"%s\n"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "\"%s\" wird als voreingestellter geheimer Signaturschlüssel benutzt\n"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "Alle für '%s' angegebenen Werte wurden ignoriert\n"
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "Eine Signatur erzeugen"
@@@ -2292,11 -1789,9 +2312,11 @@@
msgid "make a clear text signature"
msgstr "Eine Klartextsignatur erzeugen"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "Eine abgetrennte Signatur erzeugen"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "Daten verschlüsseln"
@@@ -2304,15 -1798,12 +2324,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschlüsseln"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "Daten entschlüsseln (Voreinstellung)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "Signatur prüfen"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "Liste der Schlüssel"
@@@ -2324,15 -1813,12 +2344,15 @@@ msgstr "Liste der Schlüssel und ihrer
msgid "list and check key signatures"
msgstr "Signaturen der Schlüssel auflisten und prüfen"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "Liste der geheimen Schlüssel"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "Ein neues Schlüsselpaar erzeugen"
@@@ -2352,7 -1834,6 +2372,7 @@@ msgstr "Ein neues Schlüsselpaar erzeug
msgid "generate a revocation certificate"
msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
@@@ -2380,7 -1855,6 +2400,7 @@@ msgstr "Schlüssel nur für diesen Rech
msgid "sign or edit a key"
msgstr "Signieren oder bearbeiten eines Schlüssels"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "Die Passphrase ändern"
@@@ -2428,25 -1891,18 +2448,23 @@@ msgstr "Ändern der \"Trust\"-Datenbank
msgid "print message digests"
msgstr "Hashwerte für die Dateien ausgeben"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "Im Server Modus ausführen"
+#: g10/gpg.c:489
- 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)"
+ msgid "|VALUE|set the TOFU policy for a key"
+ msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-Hülle versehen"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|Verschlüsseln für USER-ID"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
@@@ -2458,11 -1912,9 +2476,11 @@@ msgstr "|N|Kompressionsstufe auf N setz
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|DATEI|Ausgabe auf DATEI schreiben"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "Keine wirklichen Änderungen durchführen"
@@@ -2474,7 -1924,6 +2492,7 @@@ msgstr "vor Überschreiben nachfragen
msgid "use strict OpenPGP behavior"
msgstr "OpenPGP-Verhalten strikt beachten"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2483,7 -1932,6 +2501,7 @@@ msgstr "
"(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
"Optionen)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2503,11 -1951,9 +2521,11 @@@ msgstr "
" --list-keys [Namen] Schlüssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
- #: g10/gpg.c:988
++#: g10/gpg.c:991
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2517,7 -1963,6 +2535,7 @@@ msgstr "
"Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
"Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2525,74 -1970,59 +2543,74 @@@ msgstr "
"\n"
"Unterstützte Verfahren:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Öff. Schlüssel: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Verschlü.: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Komprimierung: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "Aufruf: %s [Optionen] %s\n"
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "Widersprüchliche Befehle\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2600,20 -2030,17 +2618,20 @@@ msgstr "
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2621,503 -2048,392 +2639,503 @@@ msgstr "
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Unbekanntes Konfigurationselement `%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
msgid "show key usage information during key listings"
msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "Richtlinien-URL mit den Signaturen anlisten"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "Alle Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "Standard Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "Benutzer-Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "Das Ablaufdatum mit den Signaturen anlisten"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
msgid "available TOFU policies:\n"
msgstr "Vorhandene TOFU Regeln:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "Unbekannte TOFU Regel '%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "Unbekanntes TOFU DB Format '%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
- #: g10/gpg.c:2182
++#: g10/gpg.c:2185
#, 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:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "Ungültiger Subjekt-Name '%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "`%s' ist kein gültiger Zeichensatz\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "Ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ungültige Import-Option\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "Ungültige Import-Option\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ungültige Export-Option.\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "Ungültige Export-Option\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ungültige Listen-Option.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "Ungültige Listen-Option\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "Foto-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "Alle Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
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:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
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:3053
++#: g10/gpg.c:3060
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:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
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:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "Ungültige Überprüfungs-Option\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, 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:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed müssen größer als 0 sein\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed müssen größer als 1 sein\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "ungültige Standard-Voreinstellungen\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "ungültige private Hashvoreinstellungen\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "ungültige private Komprimierungsvoreinstellungen\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [Dateiname]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [Dateiname]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
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:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [Dateiname]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
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:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [Dateiname]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd User-ID"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "Schlüsselexport fehlgeschlagen: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "Ungültiges Hashverfahren '%s'\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, 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:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[Dateiname]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@@ -3129,7 -2443,6 +3147,7 @@@ msgstr "|DATEI|Schlüssel aus der Schl�
msgid "make timestamp conflicts only a warning"
msgstr "differierende Zeitangaben sind kein Fehler"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
@@@ -3154,125 -2463,99 +3172,125 @@@ msgstr "Keine Hilfe vorhanden.
msgid "No help available for '%s'"
msgstr "Keine Hilfe für '%s' vorhanden."
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "Importiere Signaturen, die als nicht exportfähig markiert sind"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "Beseitige Beschädigung durch den Schlüsselserver während des Imports"
- #: g10/import.c:111
++#: g10/import.c:110
msgid "do not clear the ownertrust values during import"
msgstr "die \"Ownertrust\" Werte beim Import nicht löschen"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "ändern Sie die \"Trust\"-Datenbank nach dem Import nicht"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "Nur Änderungen bereits existierender Schlüssel vornehmen"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "entferne nach dem Import unbrauchbare Teile des Schlüssels"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "nach dem Import soviel wie möglich aus dem Schlüssel entfernen"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "überspringe den Block vom Typ %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu Schlüssel bislang bearbeitet\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ignorierte PGP-2 Schlüssel: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorierte neue Schlüssel: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ohne User-ID: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importiert: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " unverändert: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " neue User-IDs: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " neue Unterschlüssel: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " neue Signaturen: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " neue Schlüsselwiderrufe: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gelesene geheime Schlüssel: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " geheime Schlüssel importiert: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " unveränderte geh. Schl.: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nicht importiert: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " Signaturen bereinigt: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " User-IDs bereinigt: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3281,197 -2564,157 +3299,197 @@@ msgstr "
"WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
"Verfahren für folgende User-ID:\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": Einstellungen der Hashmethode %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "es ist extrem empfehlenswert Ihre Einstellungen zu ändern und\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
"Verfahrenskombinationen zu vermeiden\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
"ändern\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "Schlüssel %s: Keine User-ID\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, c-format
msgid "key %s: %s\n"
msgstr "Schlüssel %s: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr "vom Import-Aufpasser zurückgewiesen"
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "Schreiben nach '%s'\n"
- #: g10/import.c:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
- #: g10/import.c:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, 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:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
- #: g10/import.c:1579
++#: g10/import.c:1578
#, 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:1684
++#: g10/import.c:1683
#, c-format
msgid "secret key %s: %s\n"
msgstr "Geheimer Schlüssel %s: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
@@@ -3488,222 -2731,209 +3506,255 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, 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:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "Die \"Keybox\" `%s' konnte nicht erstellt werden: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, c-format
msgid "error creating keyring '%s': %s\n"
msgstr "Fehler beim Erzeugen des Schlüsselbundes `%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, c-format
msgid "keybox '%s' created\n"
msgstr "Die \"Keybox\" `%s' wurde erstellt\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, c-format
msgid "keyring '%s' created\n"
msgstr "Schlüsselbund `%s' erstellt\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "Schlüsselblockhilfsmittel`%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, c-format
msgid "error opening key DB: %s\n"
msgstr "Fehler beim Öffnen der Schlüsseldatenbank: %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[Widerruf]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[Eigenbeglaubigung]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, c-format
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d falsche Beglaubigung\n"
- msgstr[1] "%d falsche Beglaubigungen\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr ""
+ "Die Signatur mit den nicht unterstützten Public-Key-Verfahren (%d) kann "
+ "nicht geprüft werden: %s\n"
+
++#: g10/keyedit.c:620
+ #, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr ""
+ "Die Signatur mit der nicht unterstützten Hashmethode (%d) kann nicht\n"
+ "geprüft werden: %s.\n"
+
++#: g10/keyedit.c:782
+ msgid " (reordered signatures follow)"
+ msgstr " (neu geordnete Signaturen folgen)"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:895
+ #, c-format
+ msgid "key %s:\n"
+ msgstr "Schlüssel %s:\n"
+
++#: g10/keyedit.c:898
+ #, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "%d doppelte Signatur entfernt\n"
+ msgstr[1] "%d doppelte Signaturen entfernt\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
msgstr[0] "%d Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
msgstr[1] "%d Beglaubigungen wegen fehlender Schlüssel nicht geprüft\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, c-format
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "%d Beglaubigung aufgrund eines Fehlers nicht geprüft\n"
- msgstr[1] "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d falsche Beglaubigung\n"
+ msgstr[1] "%d falsche Beglaubigungen\n"
+
++#: g10/keyedit.c:909
+ #, c-format
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "%d Signatur neu eingeordnet\n"
+ msgstr[1] "%d Signaturen neu eingeordnet\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:914
#, c-format
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d User-ID ohne gültige Eigenbeglaubigung entdeckt\n"
- msgstr[1] "%d User-IDs ohne gültige Eigenbeglaubigungen entdeckt\n"
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
+ "WARNUNG: Es wurden Fehler gefunden aber nur Eigenbeglaubigungen geprüft; um "
+ "alle Beglaubigungen zu prüfen das Kommando '%s' verwenden.\n"
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3716,17 -2946,14 +3767,17 @@@ msgstr "
"unterschiedlichen Quellen ...)?\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Ich vertraue ihm marginal\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Ich vertraue ihm vollständig\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3736,52 -2963,40 +3787,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:501
++#: g10/keyedit.c:1014
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:629
++#: g10/keyedit.c:1142
#, 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:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User-ID \"%s\" ist widerrufen."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Beglaubigen ist nicht möglich.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User-ID \"%s\" ist abgelaufen."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "User-ID \"%s\" ist signierbar."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "Wirklich signieren? (j/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3790,11 -3005,9 +3841,11 @@@ msgstr "
"Die Eigenbeglaubigung von \"%s\"\n"
"ist eine PGP 2.x artige Signatur.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3803,13 -3016,11 +3854,13 @@@ msgstr "
"Ihre derzeitige Beglaubigung von \"%s\"\n"
"ist abgelaufen.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3818,44 -3029,35 +3869,44 @@@ msgstr "
"Die derzeitige Beglaubigung von \"%s\"\n"
"ist nur für diesen Rechner gültig.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" wurde bereits durch Schlüssel %s beglaubigt\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nichts zu beglaubigen für Schlüssel %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Dieser Schlüssel ist verfallen!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Dieser Schlüssel wird %s verfallen.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3865,32 -3067,26 +3916,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:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ich antworte nicht.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, 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:953
++#: g10/keyedit.c:1466
#, 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:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
msgid "Your selection? (enter '?' for more information): "
msgstr "Ihre Auswahl? ('?' für weitere Informationen): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3899,231 -3095,173 +3950,227 @@@ msgstr "
"Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
"Schlüssel \"%s\" (%s) beglaubigen wollen\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Dies wird eine Eigenbeglaubigung sein.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "Die Signatur wird als nicht-exportfähig markiert werden.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "Die Signatur wird als unwiderrufbar markiert werden.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "Ich habe diesen Schlüssel flüchtig überprüft.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Wirklich signieren? (j/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
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:1223
++#: g10/keyedit.c:1736
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "Schlüssel %s: Fehler beim Ändern der Passphrase: %s\n"
- #: g10/keyedit.c:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "speichern und Menü verlassen"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "Fingerabdruck des Schlüssels anzeigen"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
msgid "show the keygrip"
msgstr "\"Keygrip\" des Schlüssels anzeigen"
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "Schlüssel und User-IDs auflisten"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "User-ID N auswählen"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "Unterschlüssel N auswählen"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "Signaturen prüfen"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
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:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "Die ausgewählte User-ID nur für diesen Rechner beglaubigen"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "Die ausgewählte User-ID mit einer \"Trust\"-Signatur beglaubigen"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr "die ausgewählten User-IDs unwiderrufbar beglaubigen"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "Eine User-ID hinzufügen"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "Eine Foto-ID hinzufügen"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "ausgewählte User-IDs entfernen"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "einen Unterschlüssel hinzufügen"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "der Smartcard einen Schlüssel hinzufügen"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "einen Schlüssel auf die Smartcard schieben"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "eine Sicherungskopie des Schlüssels auf die Smartcard schieben"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "ausgewählte Unterschlüssel entfernen"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "Einen Widerrufschlüssel hinzufügen"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
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:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "User-ID als Haupt-User-ID kennzeichnen"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "Liste der Voreinstellungen (für Experten)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "Liste der Voreinstellungen (ausführlich)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "ändern der Voreinstellungsliste der ausgewählten User-IDs"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
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:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "Eine Notation für die ausgewählten User-IDs setzen"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "Die Passphrase ändern"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "Den \"Ownertrust\" ändern"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "Beglaubigungen der ausgewählten User-IDs widerrufen"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "Ausgewählte User-ID widerrufen"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "Schlüssel oder ausgewählten Unterschlüssel widerrufen"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "Schlüssel anschalten"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "Schlüssel abschalten"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "ausgewählte Foto-IDs anzeigen"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
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:1465
++#: g10/keyedit.c:1931
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:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Geheimer Schlüssel ist vorhanden.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4136,250 -3274,196 +4183,254 @@@ msgstr "
"Signaturen\n"
" (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Schlüssel wurde widerrufen."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "Wirklich alle User-IDs beglaubigen? (j/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
msgid "Really sign all text user IDs? (y/N) "
msgstr "Wirklich alle textbasierten User-IDs beglaubigen? (j/N) "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
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:1799
++#: g10/keyedit.c:2265
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Unbekannter Signaturtyp `%s'\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Benutze den '%s' Befehl.)\n"
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
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:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "Befehl benötigt einen Dateinamen als Argument\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
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:2031
++#: g10/keyedit.c:2497
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:2069
++#: g10/keyedit.c:2535
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:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "Diese User-ID wirklich widerrufen? (j/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
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:2099
++#: g10/keyedit.c:2565
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:2101
++#: g10/keyedit.c:2567
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:2150
++#: g10/keyedit.c:2625
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:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Setze die Liste der Voreinstellungen auf:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Änderungen speichern? (j/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Beenden ohne zu speichern? (j/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "Änderung fehlgeschlagen: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
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:2494
++#: g10/keyedit.c:2968
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" ist kein Fingerabdruck\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, c-format
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "Ungültige User-ID '%s': %s\n"
+
++#: g10/keyedit.c:3099
msgid "No matching user IDs."
msgstr "Keine passende User-ID"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
msgid "Nothing to sign.\n"
msgstr "Nichts zu beglaubigen\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Eigenschaften: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "Keyserver no-modify"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Bevorzugter Schlüsselserver:"
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "\"Notationen\": "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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"
+ msgstr "Dieser Schlüssel kann von %s-Schlüssel %s widerrufen werden"
- #: g10/keyedit.c:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(empfindlich)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "erzeugt: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "widerrufen: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "verfallen: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "verfällt: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "Aufruf: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "Kartennummer:"
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "Vertrauen: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "Gültigkeit: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4387,18 -3471,13 +4438,18 @@@ msgstr "
"Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
"Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "widerrufen"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "verfallen"
# translated by wk
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4406,15 -3485,12 +4457,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "WARNUNG: Ihr Unterschlüssel zum Verschlüsseln wird bald verfallen.\n"
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4424,72 -3500,57 +4475,72 @@@ msgstr "
"könnte\n"
" bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
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:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
msgstr[0] "%d Beglaubigung entfernt.\n"
msgstr[1] "%d Beglaubigungen entfernt.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Nichts entfernt.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "ungültig"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "User-ID \"%s\": %d Signatur entfernt\n"
msgstr[1] "User-ID \"%s\": %d Signaturen entfernt\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "User-ID \"%s\": bereits minimiert\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User-ID \"%s\": bereits sauber\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4499,271 -3560,213 +4550,271 @@@ msgstr "
" Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
" des Schlüssels führen.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
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:4018
++#: g10/keyedit.c:4536
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:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, 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:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Bitte genau eine User-ID auswählen.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "Geben Sie die \"Notation\" ein: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "Fortfahren (j/N)? "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Keine User-ID mit Hash %s\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "Kein Unterschlüssel mit Index %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "User-ID: \"%s\"\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (nicht-exportierbar)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Diese Signatur ist seit %s verfallen.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "Nicht von Ihnen signiert.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (unwiderrufbar)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "Kein geheimer Schlüssel\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User-ID \"%s\" ist bereits widerrufen\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Schlüssel %s ist bereits widerrufen\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Unterschlüssel %s ist bereits widerrufen\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "Voreinstellung `%s' ist doppelt\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "zu viele Verschlüsselungeinstellungen\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "zu viele Hashvoreinstellungen\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "zu viele Komprimierungsvoreinstellungen\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "Die Eigenbeglaubigung wird geschrieben\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"WARNUNG: Einige OpenPGP-Programme können einen DSA-Schlüssel dieser "
"Digestlänge nicht verwenden\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Signieren"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Zertif."
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Verschl."
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Authentisierung"
@@@ -4777,150 -3780,119 +4828,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "UuVvAaQq"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Mögliche Vorgänge eines %s-Schlüssels: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "Derzeit erlaubte Vorgänge: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Umschalten der Signaturfähigkeit\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Umschalten der Verschlüsselungsfähigkeit\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Umschalten der Authentisierungsfähigkeit\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Beenden\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA und RSA (voreingestellt)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA und Elgamal\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur signieren/beglaubigen)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (nur signieren/beglaubigen)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (nur verschlüsseln)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (nur verschlüsseln)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (Leistungsfähigkeit selber einstellbar)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC und ECC\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (nur signieren)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (Leistungsfähigkeit selber einstellbar)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (nur verschlüsseln)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Vorhandener Schlüssel\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "Geben Sie den \"Keygrip\" ein: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Kein gültiger \"Keygrip\" (40 Hex-Ziffern werden erwartet)\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "Kein Schlüssel mit diesem \"Keygrip\"\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Welche Schlüssellänge wünschen Sie für den Unterschlüssel? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, c-format
msgid "rounded to %u bits\n"
msgstr "gerundet auf %u Bit\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
msgid "Please select which elliptic curve you want:\n"
msgstr "Bitte wählen Sie, welche elliptische Kurve Sie möchten:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4936,7 -3908,6 +4987,7 @@@ msgstr "
" <n>m = Schlüssel verfällt nach n Monaten\n"
" <n>y = Schlüssel verfällt nach n Jahren\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4952,38 -3923,30 +5003,38 @@@ msgstr "
" <n>m = Schlüssel verfällt nach n Monaten\n"
" <n>y = Schlüssel verfällt nach n Jahren\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "Ungültiger Wert.\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "Schlüssel verfällt nie\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "Signature verfällt nie\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "Key verfällt am %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "Signatur verfällt am %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -4991,11 -3954,9 +5042,11 @@@ msgstr "
"Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
"Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Ist dies richtig? (j/N) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5009,7 -3970,6 +5060,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5025,49 -3985,38 +5076,49 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Ungültiges Zeichen im Namen\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, 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:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Email-Adresse: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Diese Email-Adresse ist ungültig\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Ungültiges Zeichen im Kommentar.\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
- #: g10/keygen.c:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5078,7 -4027,6 +5129,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5093,31 -4041,24 +5144,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfAa"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Ändern: (N)ame, (E)-Mail oder (A)bbrechen? "
- #: g10/keygen.c:2658
++#: g10/keygen.c:2671
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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5128,12 -4069,10 +5179,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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5144,62 -4083,49 +5195,62 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr "Fortsetzen? (J/n) "
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
msgid "Create anyway? (y/N) "
msgstr "Trotzdem erzeugen? (j/N) "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
msgid "creating anyway\n"
msgstr "wird trotzdem erzeugt\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, 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:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Schlüsselerzeugung abgebrochen.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, c-format
msgid "writing public key to '%s'\n"
msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
- #: g10/keygen.c:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5208,7 -4134,6 +5259,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:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5216,7 -4141,6 +5267,7 @@@ msgstr "
"Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht überein)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5224,529 -4148,425 +5275,536 @@@ msgstr "
"Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht überein)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Wirklich erzeugen? (j/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "niemals "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Entscheidende Beglaubigungsrichtlinie: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Beglaubigungsrichtlinie: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Entscheidender bevorzugter Schlüsselserver"
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Entscheidender Beglaubigungs-\"Notation\": "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Beglaubigungs-\"Notation\": "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
msgstr[0] "%d korrekte Signatur\n"
msgstr[1] "%d korrekte Signaturen\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, c-format
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "%d Beglaubigung aufgrund eines Fehlers nicht geprüft\n"
+ msgstr[1] "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] "WARNUNG: %lu Schlüssel übersprungen, da er zu groß ist\n"
msgstr[1] "WARNUNG: %lu Schlüssel übersprungen, da sie zu groß sind\n"
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Schlüsselbund"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "übersprungen \"%s\": %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Haupt-Fingerabdruck ="
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Haupt-Fingerabdruck ="
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Unter-Fingerabdruck ="
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " Schl.-Fingerabdruck ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " Kartenseriennr. ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, c-format
msgid "caching keyring '%s'\n"
msgstr "Puffern des Schlüsselbundes `%s'\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu Schlüssel bislang gepuffert (%lu Beglaubigung)\n"
msgstr[1] "%lu Schlüssel bislang gepuffert (%lu Beglaubigungen)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] "%lu Schlüssel gepuffert"
msgstr[1] "%lu Schlüssel gepuffert"
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] " (%lu Beglaubigung)\n"
msgstr[1] " (%lu Beglaubigungen)\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: Schlüsselbund erstellt\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr "In Dirmngr gesetzte Proxy Optionen ersetzen"
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "Widerrufene Schlüssel in den Suchergebnissen aufführen"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "Unterschlüssel in der Suche über Schlüssel-IDs aufführen"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr "In Dirmngr gesetzte Zeitüberschreitungsoptionen ersetzen"
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "Schlüssel für die Signaturprüfung automatisch holen"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
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:104
++#: g10/keyserver.c:103
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:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "abgeschaltet"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "%d Schlüssel wird per %s aktualisiert\n"
msgstr[1] "%d Schlüssel werden per %s aktualisiert\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, 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:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "fordere Schlüssel %s von %s an\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
msgid "no keyserver known\n"
msgstr "Kein Schlüsselserver bekannt\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "sende Schlüssel %s auf %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, c-format
msgid "requesting key from '%s'\n"
msgstr "fordere Schlüssel von %s an\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "Seltsame Länge für einen verschlüsselten Sitzungsschlüssel (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s verschlüsselter Sitzungsschlüssel\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "Öffentlicher Schlüssel ist %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %s, erzeugt %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
# [kw]
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "Verschlüsselt mit %lu Passphrases\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "Verschlüsselt mit einer Passphrase\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "vermutlich %s-verschlüsselte Daten\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA-Verschlüsselung nicht verfügbar; versucht wird stattdessen %s\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr ""
"WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "Entschlüsselung erfolgreich\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "WARNUNG: Verschlüsselte Botschaft ist manipuliert worden!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "Entschlüsselung fehlgeschlagen: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
"Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Ursprünglicher Dateiname='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"Einzelner Widerruf - verwenden Sie \"gpg --import\", um ihn anzuwenden\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "Keine Signatur gefunden\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "FALSCHE Signatur von \"%s\""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Verfallene Signatur von \"%s\""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekte Signatur von \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "Signaturüberprüfung unterdrückt\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur vom %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, 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:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Schlüssel erhältlich bei: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[ungewiß] "
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Diese Signatur ist seit %s verfallen.\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Diese Signatur verfällt am %s.\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s Signatur, Hashmethode %s%s%s\n"
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "Binäre"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "Textmodus"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "unbekannt"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
msgid ", key algorithm "
msgstr ", Schlüsselverfahren "
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, 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:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Signatur kann nicht geprüft werden: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "keine abgetrennte Signatur\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "Einzelne Signatur der Klasse 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "Signatur nach alter (PGP 2.x) Art\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "fstat von `%s' schlug fehl in %s: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) schlug fehl in %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "WARNUNG: Verwendung des experimentellen Public-Key-Verfahrens %s\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
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:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "WARNING: Verwendung des experimentellen Verschlüsselungsverfahren %s\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Hinweis: %s basierte Signaturen werden zurückgewiesen.\n"
- #: g10/misc.c:377
++#: g10/misc.c:375
#, c-format
msgid "(reported error: %s)\n"
msgstr "(gemeldeter Fehler: %s)\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "(gemeldeter Fehler: %s <%s>)\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr "(weitere Infos: "
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: mißbilligte Option \"%s\".\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
"%s:%u: Die Option \"%s\" is veraltet - sie hat eine Wirkung nur in %s.\n"
- #: g10/misc.c:1085
++#: g10/misc.c:1083
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5754,106 -4574,85 +5812,106 @@@ msgstr "
"WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat eine Wirkung nur\n"
"in %s.\n"
- #: g10/misc.c:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "nicht komprimiert"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "unkomprimiert|kein|keine"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "Mehrdeutige Option '%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, c-format
msgid "unknown option '%s'\n"
msgstr "Unbekannte Option '%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
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:1754
++#: g10/misc.c:1752
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "Unbekanntes schwache Hashverfahren '%s'\n"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, c-format
msgid "File '%s' exists. "
msgstr "Datei '%s' existiert bereits. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Überschreiben (j/N)? "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: unbekannte Dateinamenerweiterung\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Neuen Dateinamen eingeben"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "Schreiben auf die Standardausgabe\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, c-format
msgid "new configuration file '%s' created\n"
msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr ""
"WARNUNG: Optionen in `%s' sind während dieses Laufes noch nicht wirksam\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
"Sitzungsschlüssel\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "Problem mit dem Agenten: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (Hauptschlüssel-ID %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -5867,15 -4666,12 +5925,15 @@@ msgstr "
"Benutzer: \"%.*s\"\n"
"%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Geben Sie die Passphrase ein\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "Abbruch durch Benutzer\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -5884,53 -4680,44 +5942,53 @@@ msgstr "
"Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
"Benutzer: \"%s\"\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (Unterschlüssel aus Hauptschlüssel-ID %s)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
"entsperren:"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
"importieren:"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Unterschlüssel zu "
"exportieren:"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
"exportieren:"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr ""
"Möchten Sie den ausgewählten geheimen OpenPGP Unterschlüssel wirklich "
"dauerhaft entfernen? (j/N) "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr ""
"Möchten Sie den ausgewählten geheimen OpenPGP Schlüssel wirklich dauerhaft "
"entfernen? (j/N) "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, c-format
msgid ""
"%s\n"
@@@ -5992,31 -4771,24 +6050,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Kein Grund angegeben"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Schlüssel ist überholt"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Schlüssel wird nicht mehr benutzt"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "User-ID ist nicht mehr gültig"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "Grund für Widerruf: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "Widerruf-Bemerkung: "
@@@ -6030,97 -4802,78 +6088,97 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Es ist kein \"trust value\" zugewiesen für:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Weiß nicht so recht\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Nein, ihm traue ich NICHT\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Ich vertraue ihm absolut\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = Zurück zum Menü\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = diesen Schlüssel überspringen\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " q = verlassen\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, 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:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Ihre Auswahl? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Zertifikate führen zu einem letztlich vertrauenswürdigen Schlüssel:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "Dieser Schlüssel gehört wahrscheinlich dem angegebenen Besitzer\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
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:478
++#: g10/pkclist.c:477
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"
@@@ -6130,135 -4883,107 +6188,135 @@@ 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:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "Diesen Schlüssel trotzdem benutzen? (j/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
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:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Hinweis: Dieser Schlüssel wurde abgeschaltet.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Hinweis: Überprüfte Adresse des Unterzeichners ist `%s'\n"
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, 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:601
++#: g10/pkclist.c:616
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:609
++#: g10/pkclist.c:624
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:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: übersprungen: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "Verschlüsseln an '%s' ist nicht möglich\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "Option '%s' ohne gültige Standardschlüssel angegeben\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "Option '%s' ohne Verwendung der Option '%s' angegeben\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Derzeitige Empfänger:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6266,158 -4991,123 +6324,158 @@@ msgstr "
"\n"
"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Keine solche User-ID vorhanden.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "Keine gültigen Adressaten\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, 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:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Abgetrennte Beglaubigungen.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Bitte geben Sie den Namen der Datendatei ein: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "lese stdin ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "keine signierten Daten\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "kann signierte Datei '%s' nicht öffnen.\n"
- #: g10/plaintext.c:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "Ungenannter Empfänger; Versuch mit geheimen Schlüssel %s ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "Alles klar, wir sind der ungenannte Empfänger.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "alte Kodierung des DEK wird nicht unterstützt\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "Verschlüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"WARNUNG: Das Verschlüsselungsverfahren %s wurde nicht in den "
"Empfängereinstellungen gefunden\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "Hinweis: geheimer Schlüssel %s verfällt am %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "\"build_packet\" fehlgeschlagen: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "Schlüssel %s hat keine User-IDs\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Schlüssel soll widerrufen werden von:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Dies ist ein \"sensitiver\" Widerrufsschlüssel)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
msgid "Secret key is not available.\n"
msgstr "Geheimer Schlüssel ist nicht vorhanden.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "Ausgabe mit ASCII Hülle erzwungen\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Widerrufzertifikat erzeugt.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "keine Widerrufsschlüssel für \"%s\" gefunden\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Dies ist ein Widerrufszertifikat für den OpenPGP Schlüssel:"
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
@@@ -6428,7 -5118,6 +6486,7 @@@ msgstr "
"nicht möglich, ein einmal veröffentlichtes Widerrufszertifikat wieder\n"
"zurückzuziehen."
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6443,7 -5132,6 +6501,7 @@@ msgstr "
"mit angeben zu können. Weitere Informationen finden Sie im GnuPG\n"
"Handbuch unter der Beschreibung des gpg Kommandos \"--gen-revoke\"."
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
@@@ -6454,12 -5142,10 +6512,12 @@@ msgstr "
"unten eingefügt. Vor dem Import dieses Widerrufszertifikats\n"
"entfernen Sie bitte diesen Doppelpunkt mittels eines Texteditors."
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, c-format
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Widerrufzertifikat wurde als '%s.rev' gespeichert.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, c-format
msgid "secret key \"%s\" not found\n"
msgstr "Geheimer Schlüssel \"%s\" nicht gefunden\n"
@@@ -6467,22 -5153,18 +6525,22 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr "'%s' trifft auf mehrere geheime Schlüssel zu:\n"
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, c-format
msgid "error searching the keyring: %s\n"
msgstr "Fehler beim Suchen im Schlüsselbund: %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
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:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6502,79 -5184,63 +6560,79 @@@ msgstr "
"Drucksystem kann unter Umständen eine Kopie anderen Nutzern zugänglich\n"
"machen.\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Grund für den Widerruf:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Abbruch"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Wahrscheinlich möchten Sie hier %d auswählen)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Grund für Widerruf: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Keine Beschreibung angegeben)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Ist das OK? (j/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "Unsicherer Schlüssel erzeugt - neuer Versuch\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"Trotz %d-fachen Versuches konnte die Erzeugung eines unsicheren Schlüssels "
"für sym. Verschlüsselung nicht vermieden werden!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "%s-Schlüssel %s verwendet ein unsicheres (%zu-Bit) Hashverfahren\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
"%s-Schlüssel %s benötigt einen mindestens %zu Bit langen Hash (Hash ist %s)\n"
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "Siehe %s für weitere Infos\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
@@@ -6582,14 -5248,12 +6640,14 @@@ msgstr[0] "Öffentlicher Schlüssel %s
msgstr[1] ""
"Öffentlicher Schlüssel %s ist %lu Sekunden jünger als die Signatur\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "Öffentlicher Schlüssel %s ist %lu Tag jünger als die Signatur\n"
msgstr[1] "Öffentlicher Schlüssel %s ist %lu Tage jünger als die Signatur\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6602,7 -5266,6 +6660,7 @@@ msgstr[1] "
"Schlüssel %s wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhrenproblem)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6614,45 -5277,38 +6672,45 @@@ msgstr[1] "
"Schlüssel %s wurde %lu Tage in der Zukunft erzeugt (Zeitreise oder "
"Uhrenproblem)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Hinweis: Signaturschlüssel %s wurde widerrufen\n"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
"Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindungs-"
"Beglaubigung\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu groß). Verwende "
"\"unerweiterte\".\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6660,7 -5316,6 +6718,7 @@@ msgstr "
"WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu groß). Verwende "
"\"unerweiterte\".\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6669,12 -5324,10 +6727,12 @@@ msgstr "
"WARNUNG: URL für bevorzugten Schlüsselserver kann nicht %%-erweitert werden "
"(zu groß). Verwende \"unerweiterte\".\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s Signatur von: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6682,42 -5335,34 +6740,42 @@@ msgstr "
"WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
"Empfängervoreinstellungen\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "signiere:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s Verschlüsselung wird verwendet\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
"echten Zufallsgenerator verwendbar\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "übersprungen \"%s\": doppelt\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6726,261 -5371,208 +6784,262 @@@ msgstr "
"# Liste der zugewiesenen \"Ownertrust\" Werte, erzeugt am %s\n"
"# (\"gpg --import-ownertrust\" um sie zu restaurieren)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, c-format
msgid "error in '%s': %s\n"
msgstr "Fehler in `%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "Zeile ist zu lang"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "Doppelpunkt fehlt"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "ungültiger Fingerabdruck"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "\"Ownertrust\"-Wert fehlt"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "Fehler beim Suchen des \"Trust records\" in `%s': %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, c-format
msgid "read error in '%s': %s\n"
msgstr "Lesefehler in `%s': %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "Datei `%s' konnte nicht gesperrt werden\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, c-format
msgid "can't lock '%s'\n"
msgstr "'%s' kann nicht gesperrt werden\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "trustdb Transaktion zu groß\n"
- #: 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"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: Verzeichnis existiert nicht!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "kann auf `%s' nicht zugreifen: %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ungültige trust-db erzeugt\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trust-db erzeugt\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
msgid "Note: trustdb not writable\n"
msgstr "Hinweis: Die \"trustdb\" ist nicht schreibbar\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ungültige 'Trust'-Datenbank\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: Fehler beim Ändern des Versionsatzes: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek fehlgeschlagen: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: keine trustdb Datei\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: version record with recnum %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: invalid file version %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: konnte Satz nicht anhängen: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "Fehler: Die Vertrauensdatenbank ist fehlerhaft\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "Textzeilen länger als %d Zeichen können nicht benutzt werden\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "Eingabezeile ist länger als %d Zeichen\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "Fehler beim Starten einer Transaktion auf der TOFU Datenbank: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr "Fehler beim Committen einer Transaktion auf der TOFU Datenbank: %s\n"
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
"Fehler beim Zurückrollen einer Transaktion auf der TOFU Datenbank: %s\n"
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr "Nicht unterstützte TOFU Datenbank Version: %s\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Fehler beim Lesen der TOFU Datenbank: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, c-format
msgid "error determining TOFU database's version: %s\n"
msgstr "Fehler beim Feststellen der TOFU Datenbank Version: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "Fehler beim Initialisieren der TOFU Datenbank: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "Fehler beim Öffner der TOFU Datenbank '%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
"WARNUNG: Das Home-Verzeichnis hat sowohl 'tofu.db' als auch 'tofu.d'.\n"
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr "Das \"Split\" Format wird für die TOFU Datenbank benutzt\n"
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "Fehler beim Schreiben der TOFU Datenbank: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "Fehler beim Setzen der TOFU Binding Vertrauensstufe auf %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr "Die Bindung %s ist NICHT bekannt."
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- "Der Schlüssel %s steht im Konflikt mit der Bindung (%s). Die Richtlinie "
- "dieser Bindung wurde deswegen von 'auto' auf 'ask' geändert."
+ "Der Schlüssel mit dem Fingerabdruck %s steht im Konflikt mit der Bindung "
+ "(%s). Die Richtlinie dieser Bindung wurde deswegen von 'auto' auf 'ask' "
+ "geändert."
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
@@@ -6990,70 -5582,58 +7049,70 @@@ msgstr "
"Schlüssel gehört dem angegebenen Besitzer) oder eine Fälschung (ungültig) "
"ist."
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "Fehler beim Einsammeln der übrigen User-IDs: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr "Bekannte, mit diesem Schlüssel assozierte, User-IDs:\n"
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, c-format
msgid "policy: %s"
msgstr "Richtlinie: %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, c-format
msgid "error gathering signature stats: %s\n"
msgstr "Fehler beim Einsammeln der Signaturstatistik: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
msgstr[1] "Die Email-Adresse \"%s\" ist mit %d Schlüsseln assoziert:\n"
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Statistik für Schlüssel mit der Email-Adresse \"%s\":\n"
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
msgid "this key"
msgstr "dieser Schlüssel"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] "%ld Nachricht in der Zukunft signiert."
msgstr[1] "%ld Nachrichten in der Zukunf signiert."
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "%ld Nachricht signiert"
msgstr[1] "%ld Nachrichten signiert"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] " innerhalb des letzten Tages."
msgstr[1] " innerhalb der letzten %ld Tage."
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] " innerhalb der letzten Woche."
msgstr[1] " innerhalb der letzten %ld Wochen."
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7063,7 -5643,6 +7122,7 @@@ msgstr[1] " innerhalb der letzten %ld M
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
"Normalerweise ist lediglich ein Schlüssel mit einer Email-Adresse "
@@@ -7077,194 -5656,174 +7136,204 @@@
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr "gGaAuUlLfF"
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr "(G)ut, einmal (A)kzeptieren, (U)nbekannt, einmal ab(L)ehnen, (F)alsch?"
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "Fehler beim Ändern der TOFU Richtlinie: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
- msgstr[0] "%d Jahr"
- msgstr[1] "%d Jahre"
+ msgid "%d~year"
+ msgid_plural "%d~years"
+ msgstr[0] "%d~Jahr"
+ msgstr[1] "%d~Jahre"
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
- msgstr[0] "%d Monat"
- msgstr[1] "%d Monate"
+ msgid "%d~month"
+ msgid_plural "%d~months"
+ msgstr[0] "%d~Monat"
+ msgstr[1] "%d~Monate"
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
- msgstr[0] "%d Tag"
- msgstr[1] "%d Tage"
+ msgid "%d~day"
+ msgid_plural "%d~days"
+ msgstr[0] "%d~Tag"
+ msgstr[1] "%d~Tage"
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
- msgstr[0] "%d Stunde"
- msgstr[1] "%d Stunden"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
+ msgstr[0] "%d~Stunde"
+ msgstr[1] "%d~Stunden"
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
- msgstr[0] "%d Minute"
- msgstr[1] "%d Minuten"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
+ msgstr[0] "%d~Minute"
+ msgstr[1] "%d~Minuten"
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
- msgstr[0] "%d Sekunde"
- msgstr[1] "%d Sekunden"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
+ msgstr[0] "%d~Sekunde"
+ msgstr[1] "%d~Sekunden"
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr "Es wurde noch keine Nachricht mit dem Schlüssel %s überprüft!\n"
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
"Signaturstatistiken für \"%s\" (Schlüssel %s) konnten nicht gesammelt "
"werden\n"
- #: g10/tofu.c:2415
++#: g10/tofu.c:2499
#, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
- "Keine von \"%s\" signierten Nachrichten überprüft (Schl.: %s, Richtl.: %s)."
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "%ld überprüfte Nachrichten von \"%s\"."
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
- "%ld von \"%s\" (Schl.: %s, Richtl.: %s) signierte Nachricht in den letzten "
- "%s überprüft."
+ "%ld überprüfte Nachricht von \"%s\"\n"
+ "in den letzten %s."
msgstr[1] ""
- "%ld von \"%s\" (Schl.: %s, Richtl.: %s) signierte Nachrichten in den letzten "
- "%s überprüft."
+ "%ld überprüfte Nachrichten von \"%s\"\n"
+ "in den letzten %s."
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr "Die neueste Nachricht wurde vor %s überprüft."
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
"WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
"sehen.\n"
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
"WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
"gesehen.\n"
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
- "WARNUNG: Falls sie glauben, mehr als %d mit diesem Schlüssel signierte\n"
- "Nachricht erhalten zu haben, so kann es sich bei diesem Schlüssel um\n"
- "eine Fälschung handeln! Prüfen Sie die Email-Adresse genau auf kleine\n"
- "Variationen (z.B. zusätzliche Leerzeichen). Falls Ihnen der Schlüssel\n"
- "suspekt erscheint, so benutzen Sie '%s' um den Schlüssel als Fälschung\n"
- "zu markieren."
+ "WARNUNG: Falls sie glauben, mehr als %ld mit diesem Schlüssel signierte "
+ "Nachricht erhalten zu haben, so kann es sich bei diesem Schlüssel um eine "
+ "Fälschung handeln! Prüfen Sie die Email-Adresse genau auf kleine "
+ "Variationen. Falls Ihnen der Schlüssel suspekt erscheint, so benutzen Sie\n"
+ " %s\n"
+ "um den Schlüssel als Fälschung zu markieren.\n"
msgstr[1] ""
- "WARNUNG: Falls sie glauben, mehr als %d mit diesem Schlüssel signierte\n"
- "Nachrichten erhalten zu haben, so kann es sich bei diesem Schlüssel um\n"
- "eine Fälschung handeln! Prüfen Sie die Email-Adresse genau auf kleine\n"
- "Variationen (z.B. zusätzliche Leerzeichen). Falls Ihnen der Schlüssel\n"
- "suspekt erscheint, so benutzen Sie '%s' um den Schlüssel als Fälschung\n"
- "zu markieren."
+ "WARNUNG: Falls sie glauben, mehr als %ld mit diesem Schlüssel signierte "
+ "Nachrichten erhalten zu haben, so kann es sich bei diesem Schlüssel um eine "
+ "Fälschung handeln! Prüfen Sie die Email-Adresse genau auf kleine "
+ "Variationen. Falls Ihnen der Schlüssel suspekt erscheint, so benutzen Sie\n"
+ " %s\n"
+ "um den Schlüssel als Fälschung zu markieren.\n"
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "Fehler beim Öffnen der TOFU Datenbank: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "Schlüssel %s: Als vertrauenswürdiger Schlüssel akzeptiert\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "Schlüssel %s ist als ultimativ vertrauenswürdig gekennzeichnet\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "trust record %lu, req type %d: read failed: %s\n"
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
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:431
++#: g10/trustdb.c:430
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:468
++#: g10/trustdb.c:467
#, 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:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "verwende Vertrauensmodell %s\n"
@@@ -7273,7 -5831,6 +7342,7 @@@
msgid "no need for a trustdb check\n"
msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
@@@ -7320,7 -5869,6 +7389,7 @@@ msgstr "keine ultimativ vertrauenswürd
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7328,30 -5876,24 +7397,30 @@@ msgstr "
"Tiefe: %d gültig: %3d signiert: %3d Vertrauen: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
"\"Trust-DB\"-Versions-Satz kann nicht geändert werden: Schreiben "
"fehlgeschlagen: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "unbestimmt"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "niemals"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "marginal"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "vollständig"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "ultimativ"
@@@ -7363,39 -5905,30 +7432,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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "13"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ widerrufen]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[ verfallen]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ unbekannt]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[undefiniert]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[ marginal]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[vollständig]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ ultimativ]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7405,12 -5938,10 +7474,12 @@@ msgstr "
"Denken Sie daran, daß die Datei mit der Signatur (.sig oder .asc)\n"
"als erste in der Kommandozeile stehen sollte.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "fd=%d kann nicht geöffnet werden: %s\n"
@@@ -7736,7 -6199,6 +7805,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:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NAME|Die Debugstufe auf NAME setzen"
@@@ -7875,9 -6307,6 +7944,9 @@@ msgstr "Anzahl der übereinstimmenden Z
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "Schlüsselsuche im Cache des Dirmngr schlug fehl: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "Kann keinen KeyDB Handler bereitstellen\n"
@@@ -8377,7 -6701,6 +8446,7 @@@ msgstr "(dies ist wahrscheinlich keine
msgid "certificate '%s' not found: %s\n"
msgstr "Zertifikat `%s' nicht gefunden: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "Fehler beim Sperren der Keybox: %s\n"
@@@ -8401,123 -6720,93 +8470,123 @@@ msgstr "Fehler beim Löschen des Zertif
msgid "no valid recipients given\n"
msgstr "Keine gültigen Empfänger angegeben\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "Externe Schlüssel anzeigen"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "Schlüssel mit Zertifikatekette anzeigen"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "Zertifikate importieren"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "Zertifikate exportieren"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "Smartcard registrieren"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "Das Kommando an den Dirmngr durchreichen"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "Rufe das gpg-protect-tool auf"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "Ausgabe im Basis-64 Format erzeugen"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "Eingabedaten sind im PEM Format"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "Eingabedaten sind im Basis-64 Format"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "Eingabedaten sind im Binärformat"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "Niemals eine CRL konsultieren"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "Die Gültigkeit mittels OCSP prüfen"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|Sende N Zertifikate mit"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "Zertifikatsrichtlinien nicht überprüfen"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "Fehlende Zertifikate automatisch holen"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "das Terminal gar nicht benutzen"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "Stapelmodus: Keine Abfragen"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "\"Ja\" als Standardantwort annehmen"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "\"Nein\" als Standardantwort annehmen"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|Hashverfahren NAME benutzen"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Aufruf: @GPGSM@ [Optionen] [Dateien] (-h für Hilfe)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8526,46 -6815,37 +8595,46 @@@ msgstr "
"Syntax: @GPGSM@ [Optionen] [Dateien]\n"
"Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: Kein Server-Name angegeben\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: Passwort ohne Benutzer\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: Zeile wird übersprungen\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "Importiere allgemeine Zertifikate: %s\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "Signieren mit `%s' nicht möglich: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@@ -8582,7 -6859,6 +8651,7 @@@ msgstr "Fehler beim Speichern des Zerti
msgid "basic certificate checks failed - not imported\n"
msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
@@@ -8597,31 -6871,25 +8666,31 @@@ msgstr "Fehler beim Importieren des Zer
msgid "error reading input: %s\n"
msgstr "Fehler beim Lesen der Eingabe: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "Kann den Fingerprint nicht ermitteln\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "Problem bei der Suche nach vorhandenem Zertifikat: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "Fehler bei der Suche nach einer schreibbaren KeyDB: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "Fehler beim Speichern des Zertifikats: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "Problem bei Wiederfinden des Zertifikats: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "Fehler beim Speichern der Flags: %s\n"
@@@ -8816,7 -7051,6 +8885,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
msgid "certificate already cached\n"
msgstr "Zertifikat ist bereits im Zwischenspeicher\n"
@@@ -8824,8 -7057,6 +8893,8 @@@
msgid "certificate cached\n"
msgstr "Zertifikat wurde zwischengespeichert\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, c-format
msgid "error caching certificate: %s\n"
msgstr "Fehler beim Zwischenspeichern des Zertifikats: %s\n"
@@@ -9439,12 -7547,10 +9508,12 @@@ msgstr "Zertifikate werden im PEM Forma
msgid "force the use of the default OCSP responder"
msgstr "Die Nutzung des voreingestellten OCSP Responder erzwingen"
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9457,77 -7563,61 +9526,77 @@@ 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:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "Fehler beim Lesen des Zertifikats von `%s': %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr "Zertifikat ist zu groß um Sinnvoll zu sein\n"
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, c-format
msgid "lookup failed: %s\n"
msgstr "Aufsuchen fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "Laden der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr "Ein dirmngr ist vorhanden und aktiv\n"
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "Prüfung des Zertifikats fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
msgid "certificate is valid\n"
msgstr "Zertifikat ist gültig\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
msgid "certificate has been revoked\n"
msgstr "Zertifikat wurde widerrufen\n"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, c-format
msgid "certificate check failed: %s\n"
msgstr "Zertifikatprüfung fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr "Erhielt Status: `%s'\n"
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "Fehler beim Schreiben der Base-64 Darstellung: %s\n"
- #: dirmngr/dirmngr-client.c:685
++#: dirmngr/dirmngr-client.c:702
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "Nicht unterstützte INQUIRY `%s'\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr "Absoluter Dateiname erwartet\n"
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr "Auffinden von `%s'\n"
@@@ -9674,12 -7730,10 +9743,12 @@@ msgstr "Aufruf: %s [Optionen]
msgid "colons are not allowed in the socket name\n"
msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
@@@ -10157,76 -8109,60 +10226,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:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr "LDAP Server fehlt"
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr "Seriennummer fehlt in der Cert-ID"
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, c-format
msgid "error sending data: %s\n"
msgstr "Fehler beim Senden der Daten: %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d überschritten\n"
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "Fehler beim Initialisieren des Servers: %s\n"
- #: dirmngr/server.c:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept Problem: %s\n"
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
diff --cc po/el.po
index b8a3a32,d4316dd..6151c16
--- a/po/el.po
+++ b/po/el.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <madf at hellug.gr>\n"
"Language-Team: Greek <nls at tux.hellug.gr>\n"
@@@ -100,8 -84,6 +100,8 @@@ msgstr "�������������� �� ����� ������
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "���� ����� ������"
@@@ -157,25 -128,11 +157,25 @@@ msgstr "���� ����� ������
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "��� ������������� � ���������� ���������� %d%s\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -384,8 -302,6 +384,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "������ ��� ������ ������"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -395,118 -311,87 +395,118 @@@ msgstr "
"��������:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "���������"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "����� ������"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "��������� �������� �� ��� ���������� ��������"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "�������� ��� ����� ��������� ������������"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "��� �������������"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -515,164 -400,124 +515,169 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
- #: agent/gpg-agent.c:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/gpg-agent.c:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: agent/gpg-agent.c:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: ��������� �������������\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read ������� (n=%d): %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: �������� ����������� ���������: %s\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ������������: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
@@@ -688,8 -531,6 +693,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -697,9 -538,6 +702,9 @@@ msgstr "
"@�������:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -709,46 -547,38 +714,46 @@@ msgstr "
"��������:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "�������"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@@ -812,8 -632,6 +817,8 @@@ msgstr "
msgid "Yes"
msgstr "���|���"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -843,46 -658,38 +848,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "������ ��� ������ ������"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "����������� ��� ������"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -923,53 -723,42 +928,57 @@@ msgstr "��� ������������� � ����������
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "��� ������������� � ���������� ���������� %d%s\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "� ��������� �������: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -984,17 -771,18 +993,22 @@@ msgstr "�������� ������������ �� �� gpg
msgid "problem setting the gpg-agent options\n"
msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "��������� ��� �� ������\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "�������� ��������������� ��� core dump: %s\n"
@@@ -1065,17 -839,18 +1079,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, fuzzy, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1403,7 -1111,6 +1422,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "�� �������������"
@@@ -1413,22 -1119,14 +1432,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "�� ������� �������� ���������\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "������� ��� bug ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "�������� �������: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "�������� ��������� ��� �������: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
@@@ -1467,89 -1158,75 +1481,95 @@@ msgstr "�� ������� ������ %08lX ��� ���
msgid "waiting for lock %s...\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "��������: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "�� ������ ����������� ���������: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "����������� ���������: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "�� ������ ����������� clearsig\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "����������� ���������: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "����������� �� ���������������� ���������\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "�� ����������� ��������:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "�� ������ dash escaped ������: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "�� ������� radix64 ���������� %02x ���������\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "������ ����� ������� (������� CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "������ ����� ������� (����� CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "����� ����� CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "������ CRC: %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "������ ����� ������� (��� �railer)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "������ ��� ������ trailer\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "�� �������� ������ OpenPGP ��������.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
"������������� MTA\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "�� ����������"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1557,84 -1234,73 +1577,95 @@@ msgstr "
"��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
"��� �� ����� �� ��� '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
+ "��� �� ����� �� ��� '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "�������������: �������� �� ������ �������� ���������\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "�� ����������"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "�������������� �� ����� ������: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "�������������: �� %s ����������� �� %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "�� ������� ������ ��� ����� ���������"
- #: g10/card-util.c:92 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "������� ��� �������� �������� ��� ����� ���������\n"
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "� ������� ���; "
@@@ -1701,21 -1353,11 +1732,16 @@@ msgstr "������ ��������� ������� ������
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 tools/no-libgcrypt.c:30
- #, fuzzy, c-format
- msgid "error allocating enough memory: %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
-
- #: g10/card-util.c:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "�������� �������� ��� ����������� `%s': %s\n"
@@@ -1813,13 -1436,10 +1839,13 @@@ msgstr "�� ������� �������� �� ������;
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "�� ������� �������� �� ������; (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "����������������� ��� �� %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1874,9 -1484,6 +1900,9 @@@ msgstr " (%d) RSA (��� �������������
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "�� ������ �������.\n"
@@@ -1910,7 -1511,6 +1936,7 @@@ msgstr "������� �� ���������;
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "����������� ����� ��� �����"
@@@ -1919,7 -1518,6 +1945,7 @@@
msgid "show admin commands"
msgstr "������������� �������\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "���������� ����� ��� ��������"
@@@ -2003,126 -1583,97 +2029,126 @@@ msgstr "������������� �������\n
msgid "Admin commands are not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "�� ������ ������ (��������� \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output ��� ���������� ��� ���� ��� ������\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "�������� ��������� ��� `%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: g10/delkey.c:130 g10/delkey.c:137
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(����� ��� ������������� ��� ������ ��� ���������)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "��� ������ �� ����� ���� �� ��������� ������ ����� �� \"--yes\"\n"
- #: g10/delkey.c:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "�������� ����� ��� �������� ��� �� ����������; "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "���� ����� ��� ������� ������! - ������� �� ���������; "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "key"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "�����������:"
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "���������� ����������� ������������-���������\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "������� ��� ������� ������ ��� �� ������� ������ \"%s\"!\n"
- #: g10/delkey.c:272
++#: g10/delkey.c:271
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr ""
"��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
- #: g10/encrypt.c:226 g10/sign.c:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "�������� ������ ���� ����������� ������� ESK ���� ��� ���������� S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "����� ��� ���������������: %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' ��� �����������\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "�������������: `%s' ����� ��� ����� ������\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "�������� ��� `%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2130,7 -1681,6 +2156,7 @@@ msgstr "
"� ������������ ����������� ���������� %s (%d) ���������� ���\n"
"�������� ��� ���������\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2139,41 -1689,34 +2165,41 @@@ msgstr "
"� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"�������� ��� ���������\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"� ������������ ����������� ���������� %s (%d) ���������� ���\n"
"�������� ��� ���������\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s ��������������� ���: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s ��������������� ��������\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "��������������� �� ������� ��������� %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"�������������: �� ������ ��������������� �� ������� ������ ���\n"
"���������� ��������������.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "�������� ��� �������� ���������������� �������\n"
@@@ -2234,7 -1766,6 +2260,7 @@@ msgstr "�������������: �������� �������
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
- #: g10/export.c:79
++#: g10/export.c:78
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
@@@ -2242,133 -1773,106 +2268,133 @@@
"� �������� �� ��������� ��� ��-�����������.\n"
"\n"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "�� ��������������� ������� ������"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ������������: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "������ %08lX: ������ ����� PGP 2.x - ������������\n"
- #: g10/export.c:1241
++#: g10/export.c:1240
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr ""
"������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
- #: g10/export.c:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "�������������: ��� ����� ������ �������\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "������ ���� �� ���������� ��� `%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[User id ��� �������]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "������ ���� �� ���������� ��� `%s': %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "������ ���� �� ���������� ��� `%s': %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "���������� ��� fingerprint"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "�� ������� ������ `%s' �� �������: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|�����|����� �������� ��� �������������� ������� ������"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|�����|����� �������� ��� �������������� ������� ������"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
- #: g10/gpg.c:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "���������� ���� �� ������������� ���������"
@@@ -2378,11 -1881,9 +2404,11 @@@
msgid "make a clear text signature"
msgstr "|[������]|���������� ���� �� ���������������� ���������"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "���������� ���� �� ������������� ���������"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "������������� ���������"
@@@ -2390,15 -1890,12 +2416,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "������������� �� ����� ���� ����������� ����������"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "���������������� ��������� (��������������)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "���������� ���� ���������"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "���������� ��� ������ ��������"
@@@ -2411,15 -1906,12 +2437,15 @@@ msgstr "���������� ��� ������ ��������
msgid "list and check key signatures"
msgstr "������� ��������� ��������"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "���������� ��� ������ �������� ��������"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "���������� ���� ���� ������� ��������"
@@@ -2443,7 -1931,6 +2469,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "���������� ���� �������������� ���������"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
@@@ -2475,7 -1956,6 +2501,7 @@@ msgstr "�������� ���� �������� ������
msgid "sign or edit a key"
msgstr "�������� � ����������� ���� ��������"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "������ ��� ������ ������"
@@@ -2525,24 -1994,19 +2551,24 @@@ msgstr "�������� ��� ����� ��������� ��
msgid "print message digests"
msgstr "|����� [������]| ���������� ���������� ��� ���������"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "���������� ascii ������������ ������"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|�����|������������� ��� �����"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
@@@ -2556,12 -2018,10 +2582,12 @@@ msgstr "|N|���������� �������� ��������
msgid "use canonical text mode"
msgstr "����� ��������� ���������� ��������"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "�� �� ����� ������ ������"
@@@ -2573,7 -2031,6 +2599,7 @@@ msgstr "������� ���� ��� ���������
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2581,7 -2038,6 +2607,7 @@@ msgstr "
"@\n"
"(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2601,13 -2057,11 +2627,13 @@@ msgstr "
" --list-keys [�������] ���������� ��������\n"
" --fingerprint [�������] ���������� ������������ (fingerprints)\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: g10/gpg.c:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2622,7 -2076,6 +2648,7 @@@ msgstr "
"��������, �������, ������������� � ����������������\n"
"� �������������� ���������� ��������� ��� �� �������� �������\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2630,608 -2083,479 +2656,608 @@@ msgstr "
"\n"
"��������������� ����������:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "�����������:"
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "���������������: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "��������: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "�����: gpg [��������] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "������������� �������\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1537
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1546
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1549
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "������� ����������� ��������� \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "������������� ��� ������"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�������� ������� ��� exec-path �� %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�������������: �� %s ����������� �� %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"� ����������� ���������� ��������� ��� �����������\n"
"��� ����� �������\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "�� ������� �����������\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "�� ������� ����������� ���������� ���������������\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3638
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3636
++#: g10/gpg.c:3643
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"�������������: ������� ���������� (-r) ����� ����� ��������������\n"
"�������� ��������\n"
- #: g10/gpg.c:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [����� �������]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [����� �������]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "���������������� �������: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [����� �������]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
- #: g10/gpg.c:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [����� �������]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [����� �������]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [����� �������]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [����� �������]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [�������]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver ���� �������: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "������� �������� �������: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "������� �������� �������: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver ��������� �������: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "����������� �������: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�������� �������: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[����� �������]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@@ -3245,7 -2567,6 +3271,7 @@@ msgstr "������� ��� �������� ��� ���� �
msgid "make timestamp conflicts only a warning"
msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|������� ��� ����������� ���������� ��� FD"
@@@ -3272,326 -2589,260 +3298,326 @@@ msgstr "��� ������� ��������� �������
msgid "No help available for '%s'"
msgstr "��� ������� ��������� ������� ��� `%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "�������� ��� ����� ��������� ������������"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "�������� ��� ����� ��������� ������������"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "�� ��������������� ������� ������"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "��������� �������� ��� ����� %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu ������� ����� ����� ���� ������������\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "��������� ������� ��� ��������������: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ��� ������� ��� �������������: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ��� ������� ��� �������������: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ����� user ID: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " ����������: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " ����������: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ��� user ID: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " ��� ����������: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " ���� ���������: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " ���� ���������� ��������: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " ����������� ������� �������: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " ���������� ������� �������: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " ���������� ������� �������: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " �� ����������: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " ���� ���������: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " ����������� ������� �������: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s ��������, ���������� ��������� %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "������������ `%s': %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "������ %08lX: ��� ���� ������ user ID\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "������ %08lX: ��� ������ - ������������\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "��� ������� ��������� ����������: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "�������� �������� ��� ����������� `%s': %s\n"
- #: g10/import.c:1111
++#: g10/import.c:1110
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
- #: g10/import.c:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
- #: g10/import.c:1202
++#: g10/import.c:1201
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "������ %08lX: \"%s\" ����������\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "������ %08lX: ������� ������ ���������\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "������������: ������� ������ ��� �����\n"
- #: g10/import.c:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "�� ������� ������ `%s' �� �������: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
@@@ -3606,205 -2857,183 +3632,225 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
"���������\n"
- #: g10/import.c:1898
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"������ %08lX: �� ��������������� ���������� �������� �������� ��� user id "
"\"%s\"\n"
- #: g10/import.c:2026
++#: g10/import.c:2025
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
- #: g10/import.c:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "������ %08lX: ����� �������� �������� ����������\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "������ %08lX: �� ������ �������� �����������\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
- #: g10/import.c:2122
++#: g10/import.c:2121
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "������ %08lX: �� ������ �������� �����������\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "������ %08lX: ������������ user ID '"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "������ %08lX: ������������ ���������\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
- #: g10/import.c:2245
++#: g10/import.c:2244
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
- #: g10/import.c:2263
++#: g10/import.c:2262
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
- #: g10/import.c:2285
++#: g10/import.c:2284
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
- #: g10/import.c:2414
++#: g10/import.c:2413
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
- #: g10/import.c:2478
++#: g10/import.c:2477
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� "
"%08lX\n"
- #: g10/import.c:2494
++#: g10/import.c:2493
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
"��� ����� �����.\n"
- #: g10/import.c:2558
++#: g10/import.c:2557
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "������ %08lX: ����� �������� �������� ����������\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "���������� `%s' �������������\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "���������� `%s' �������������\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "������ ���� �� ���������� ��� `%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "�������� ������������ ��� cache �����������: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[��������]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[����-��������]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d ����� ���������\n"
- msgstr[1] "%d ����� ���������\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "%s ��������, ���������� ��������� %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "���� �������� ��� \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "������������ `%s': %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "�� user ID \"%s\" ����������."
+ msgstr[1] "�� user ID \"%s\" ����������."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3812,23 -3041,25 +3858,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 �������� ��� ��������� ���� ������� ��������\n"
msgstr[1] "1 �������� ��� ��������� ���� ������� ��������\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 �������� ��� ��������� ���� ���� ���������\n"
- msgstr[1] "1 �������� ��� ��������� ���� ���� ���������\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d ����� ���������\n"
+ msgstr[1] "%d ����� ���������\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d user ID ������������ ����� ������� ����-���������\n"
- msgstr[1] "%d user ID ������������ ����� ������� ����-���������\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "���� �������� ��� \""
+ msgstr[1] "���� �������� ��� \""
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3841,68 -3072,53 +3893,68 @@@ msgstr "
"�� �������� passports ��� fingerprints ��� �������� �����...);\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = ��� ������ �����������\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = ��� ����� �����������\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "�� user ID \"%s\" ����������."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "������� ������ ����� �� �� ����������; (y/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " �������� ���������.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "�� user ID \"%s\" ���� �����."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "������� �� ���������; "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3911,11 -3127,9 +3963,11 @@@ msgstr "
"� ����-�������� ��� \"%s\"\n"
"����� ��� �������� ����� PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
- #: g10/keyedit.c:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3924,12 -3138,10 +3976,12 @@@ msgstr "
"� ������������ �������� ��� ��� \"%s\"\n"
"���� �����.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
- #: g10/keyedit.c:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3938,43 -3150,34 +3990,43 @@@ msgstr "
"� ������������ �������� ��� ��� \"%s\"\n"
"����� ��� ������ ��������.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
- #: g10/keyedit.c:824
++#: g10/keyedit.c:1337
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
- #: g10/keyedit.c:828
++#: g10/keyedit.c:1341
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "������� ������ ����� �� �� ��������������; (y/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "������ ��� �� ��������� �� �� ������ %08lX\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "���� �� ������ ���� �����!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "������ � ���������� �� ����� ����������; (Y/n) "
- #: g10/keyedit.c:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3984,32 -3187,26 +4036,32 @@@ msgstr "
"������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
"�������\"0\".\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) ��� ������.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) ��� ��� ������� �������.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ��� ����� ��� ������ ������.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) ��� ����� ���������� ������.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "� ������� ���; (�������������� ? ��� �����������): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4018,21 -3215,18 +4070,21 @@@ msgstr "
"������� ������ �� ���������� ���� �� ������\n"
"�� �� ������ ���: \""
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"���� �� ����� ��� ����-��������.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"�������������: � �������� �� �� ��������� ��� ��-���������.\n"
- #: g10/keyedit.c:1010
++#: g10/keyedit.c:1523
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
@@@ -4040,14 -3234,12 +4092,14 @@@
"�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
"\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:1533
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"� �������� �� ��������� ��� ��-���������.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
@@@ -4055,237 -3247,184 +4107,233 @@@
"� �������� �� ��������� ��� ��-�����������.\n"
"\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"��� ��� ������� ������� ���� �� ������.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"��� ����� ����������� ������ �� ���� �� ������.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"��� ������� ���� ���������� ���� �� ������.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "������� �� ���������; "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "� �������� �������: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/keyedit.c:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "���������� ��������� �������� ��� ����� ����\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "���������� ��� ������"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "���������� ��� fingerprint"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "�������� ���������: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "���������� ��� �������� ��� ��� user ID"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "������� user ID N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "������� user ID N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "�������� ���������"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "�������� ��� �������� ������"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "��������: �������� �� user ID ��� ��������\n"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "�������� ���� user ID"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "�������� ���� photo ID"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "�������� ���� user ID"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "�������� ���� ������������� ��������"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "�������� ���� �������� ���������"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "�������� ��� user ID ��� ��������"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "���������� ����������� (�������)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "���������� �������� (���������)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "������ ��� ������ ������"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "������ ��� ������������ ���������"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "�������� ���� user ID"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "�������� ���� ������������� ��������"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "����������� ��� ������"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "������������� ��� ������"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "���������� photo ID"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "�� ������� ������ ����� ���������.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4293,268 -3432,216 +4341,274 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "�� ������ ����������."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "������� �� ���������� ��� �� user ID; "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "������� �� ���������� ��� �� user ID; "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "��������: �������� �� user ID ��� ��������\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "������� ����� ���������"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
- #: g10/keyedit.c:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "������ �� ��������� �� �������� ��� user ID.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "������� ������ �� ��������� ���� �� user ID; "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "������ �� ��������� ����������� ��� ������.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "�������� ��������� ��� `%s': %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "������ �� ��������� ����������� ��� ������.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "������� ������ �� ��������� ���� �� user ID; "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "������� ����������� ��������"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "������� �� ���������� �� �����������;"
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "���������� ��� �������; "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "����������� ����� ����������; "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "������: �� ������ ���������\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "�� ������ ����\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "��� ������� ���� �� user ID.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "������ ��� �� ��������� �� �� ������ %08lX\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "��������: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "����������: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "��������: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
- #: g10/keyedit.c:3101
++#: g10/keyedit.c:3620
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
- #: g10/keyedit.c:3125
++#: g10/keyedit.c:3644
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
- #: g10/keyedit.c:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr " (���������)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "�������� ����������� ��� %s: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[����������]"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [�����: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [�����: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, fuzzy, c-format
msgid "usage: %s"
msgstr " �����������: %c/%c"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " �����������: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "���� �� ������ ���� ���������������"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4562,19 -3649,14 +4616,19 @@@ msgstr "
"� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
"����� ��� ��� �������������� �� ���������.\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[����������]"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4582,17 -3664,14 +4636,17 @@@ msgstr "
"�������������: ��� ���� ��������� ID ������ ��� ��������. ���� � ������\n"
" ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4601,35 -3680,27 +4655,35 @@@ msgstr "
"�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
" ������ �� ����� ������� �������� PGP �� �� ����������.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "������� ����� ������ �� �� ����������; (y/N) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
- #: g10/keyedit.c:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4637,38 -3708,31 +4691,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "����������� %d ��������.\n"
msgstr[1] "����������� %d ��������.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "������ ��� �����������.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
#, fuzzy
msgid "invalid"
msgstr "�� ������ ��������"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "�� user ID \"%s\" ����������."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "�� user ID \"%s\" ����������."
msgstr[1] "�� user ID \"%s\" ����������."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4678,38 -3742,31 +4732,38 @@@ msgstr "
" ������������ �������� ������ �� ����� ������� �������� PGP\n"
" �� �� ����������.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
- #: g10/keyedit.c:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "�������������� �� user ID ��� ����������� ��������: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
- #: g10/keyedit.c:3920
++#: g10/keyedit.c:4439
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
- #: g10/keyedit.c:3942
++#: g10/keyedit.c:4461
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr ""
"�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
"���������!\n"
- #: g10/keyedit.c:3967
++#: g10/keyedit.c:4485
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4717,7 -3774,6 +4771,7 @@@ msgstr "
"����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
"N): "
- #: g10/keyedit.c:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4726,237 -3782,187 +4780,237 @@@ msgstr "
"����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
"N): "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
msgid "You can't change the expiration date of a v3 key\n"
msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
- #: g10/keyedit.c:4144
++#: g10/keyedit.c:4768
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
"������������\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "������ �� ��������� ������� ��� user ID.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
- #: g10/keyedit.c:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "������� ������ ����� �� �� ���������������; (y/N) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "������� ������ ����� �� �� ���������������; (y/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "�������� ���������: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "��������� (y/N); "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "user ID: \""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " ����������� ��� %08lX ���� %s%s%s\n"
- #: g10/keyedit.c:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (��-���������)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���� � �������� ����� ���� %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
#, fuzzy
msgid "Not signed by you.\n"
msgstr " ����������� ��� %08lX ���� %s%s\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "����� ��������� ���� �� user ID:\n"
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr " (��-���������)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " ���������� ��� %08lX ���� %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "��������� �� ����������� ����� ��� ���������:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "������ ������� ������\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
- #: g10/keyedit.c:5509
++#: g10/keyedit.c:6133
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "� ���������� %c%lu ������������\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "���� ������ `%c' �����������\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "���� ������ `%c' �����������\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "���� ������ `%c' �����������\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "������� ������ ���������\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "������� ����-���������\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "������� ��������� \"�������\" ��������\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "�� ������ ������� ��������, ����� %u bits\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "��������������� ��� ������� �������� ��� %u bits\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "������������� ���������"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -4970,157 -3976,126 +5024,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (��� ������������� ����)\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA ��� ElGamal (��������������)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA ��� ElGamal (��������������)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (��� �������� ����)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (��� �������� ����)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (��� ������������� ����)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (��� ������������� ����)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (��� ������������� ����)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (��� ������������� ����)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA ��� ElGamal (��������������)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (��� �������� ����)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (��� ������������� ����)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (��� ������������� ����)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (��� ������������� ����)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "�������� ���������: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "�� ������� �������� �� ������; (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "�� ������� �������� �� ������; (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "����������������� ��� �� %u bits\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5136,7 -4111,6 +5190,7 @@@ msgstr "
" <n>m = �� ������ ����� �� n �����\n"
" <n>y = �� ������ ����� �� n ���\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5152,40 -4126,32 +5206,40 @@@ msgstr "
" <n>m = �� ������ ����� �� n �����\n"
" <n>y = �� ������ ����� �� n ���\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "�� ������ ����� ������ ���; (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "� �������� ����� ������ ���; (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "�� ������ ����\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "�� %s ��� ����� ����\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "�� %s ��� ����� ����\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "�� %s ����� ���� %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5193,12 -4159,10 +5247,12 @@@ msgstr "
"�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
"����, �� ����������� ����� ��� �� 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "����� ���� ����� (y/n); "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5209,7 -4173,6 +5263,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5226,50 -4189,39 +5280,50 @@@ msgstr "
" \"Nikolaoy Nikos (toy Ioanni) <nikoln at athens.gr>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "������� �����: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "�� ������� ���������� ��� �����\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "��������� Email: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "�� ������ ��������� Email\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "������: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "�� ������� ���������� ��� ������\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5280,7 -4232,6 +5334,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
@@@ -5295,35 -4246,28 +5349,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2665
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
- #: g10/keygen.c:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "��������, ��������� ����� �� ������\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5335,12 -4279,10 +5389,12 @@@ msgstr "
"���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
"��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "� ���������� �������� �������: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5348,66 -4290,53 +5402,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' ��� �����������\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "����� ���������� ����� ��� ��������; "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
msgid "creating anyway\n"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "� ���������� �������� ����������.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "�� ������� ��������� ������� ����������: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5418,7 -4347,6 +5472,7 @@@ msgstr "
"�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
"��� ���������� ������ ��� ���� �� ����.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5426,7 -4354,6 +5480,7 @@@ msgstr "
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5434,7 -4361,6 +5488,7 @@@ msgstr "
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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"
@@@ -5442,45 -4368,35 +5496,45 @@@ msgstr "
"��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
"�� �� OpenPGP\n"
- #: g10/keygen.c:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
- #: g10/keygen.c:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "������� �� ������������; "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "���� "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "�������� �������� ���������: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "�������� ���������: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "�������� �������� ���������: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "�������� ���������: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5488,69 -4404,63 +5542,77 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d ����� ���������\n"
msgstr[1] "%d ����� ���������\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 �������� ��� ��������� ���� ���� ���������\n"
+ msgstr[1] "1 �������� ��� ��������� ���� ���� ���������\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "����������"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "������������ `%s': %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "��������� �������� ��������:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " ��������� �������� ��������:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " ��������� �����������:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " ��������� �������� ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "������� ����������� `%s'\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu ������� ����� �������� (%lu ���������)\n"
msgstr[1] "%lu ������� ����� �������� (%lu ���������)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5558,530 -4468,423 +5620,530 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 ���� ��������\n"
msgstr[1] "1 ���� ��������\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: ���������� �������������\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "������ �������� %08lX ��� �� %s\n"
msgstr[1] "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
- #: g10/keyserver.c:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"����������� �� �� ������ ��� %08lX ���� %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s ������ ���������������� ��������\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "��������������� �� ������� ��������� %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "������� ������ ����� %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "��������������� �� %u-bit %s ������, ID %08lX, ������������� %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ������ ��� \""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "��������������� �� %s key, ID %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "������������� �� ������� ������ �������: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "��������������� �� %lu ������� �������\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "��������������� �� 1 ����� ������\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "������� %s ���������������� ���������\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
"%s ��������\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "���������������� OK\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "���������������� �������: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "������ ����� �������='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "������� �������� ��� \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "��������� ��������� ���������\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "�������� ��������� ����� ��� ��������� ���������\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ������ ��� \""
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
- #: g10/mainproc.c:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "������ ��������� ���: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[�������]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ������ ��� \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "�������"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "���������-��������"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "�������"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "�������� ���������� �������� ��������"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "�������� ������� ��� ���������: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "��� ����� ���������� ��������\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "���������� �������� ������ 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "�������� ������ ���� (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "�������� ��������� ��� �������: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: read ������� (n=%d): %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"����������� ��� ���������\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "�� ������������ ���������� ��������������"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s ��������, ���������� ��������� %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr ""
"� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"����������� ��� ���������\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "������ ���������: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "������ ���������: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "�������� �������������� �� \"%s%s\" ��������\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
- #: g10/misc.c:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "����������"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "����������"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
- #: g10/misc.c:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "�������� �������� ��� `%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "������� ����� ���������"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "�� ������ `%s' ������� ���. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "��������� (y/N); "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: ������� ��������\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "�������������� ��� ��� ����� �������"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "������� ���� stdout\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "������� �������������� ��������� ��� `%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "������������� ��� ������ �������� `%s'\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr ""
"�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (����� ������, ID %08lX)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6095,15 -4898,12 +6157,15 @@@ msgstr "
"\"%.*s\"\n"
"%u-bit %s ������, ID %08lX, ���������� %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "�������������� �� ����� ������\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "��������� ��� �� ������\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6113,47 -4913,38 +6175,47 @@@ msgstr "
"���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
"��� �� ������: \""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6209,31 -4992,24 +6271,31 @@@ msgstr "����� ���� � ���������� ����� (
msgid "unable to display photo ID!\n"
msgstr "�������� ����������� ��� photo ID!\n"
- #: g10/pkclist.c:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "��� ���� ������� �����"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "�� ������ ���� ����������"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "�� ������ ���� �������"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "�� ������ �� ��������������� �����"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "�� User ID ��� ����� ����� ������"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "����� ��� ��������:"
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "������ ���������:"
@@@ -6247,100 -5023,81 +6309,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"��� ������ ���� ������������ ���:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " ������ ��� \""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, fuzzy
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "���� �� ������ ������� ������ ���� ���������\n"
- #: g10/pkclist.c:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = ��� ����\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = ��� ��� �����������\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = ������������ �������\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = ���� ��� ������ �����\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = ��������� ����� ��� ��������\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " q = �����������\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "� ������� ���; "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, fuzzy
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "������� ������ ���� �� ������ �� ������� ��� �������� ������������; "
- #: g10/pkclist.c:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "������������� ��� ������� �� ��� ������ �������� ������������:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, fuzzy, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
- #: g10/pkclist.c:441
++#: g10/pkclist.c:440
#, fuzzy, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
- #: g10/pkclist.c:447
++#: g10/pkclist.c:446
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "���� �� ������ ������� ������ ���� ���������\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "���� �� ������ ������ �� ����\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6352,136 -5109,108 +6414,136 @@@ msgstr "
"�� ���������� ���� ������� ������� ����������\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "����� ���������� ����� ��� ��������; "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "�������������: ����� �������� ����� �����������!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"�������������: ���� �� ������ ������ �� ��������� (������ �� ������ "
"���������)\n"
- #: g10/pkclist.c:547
++#: g10/pkclist.c:562
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr ""
"�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " ���� ������ �� �������� ��� � �������� ����� ������������.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr ""
"�������������: ���� �� ��������� ���� ��������� ��� ��� ��������� ���!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "��������: ���� �� ������ ���� ���������������.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "��������: ���� �� ������ ���� �����!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
"��������!\n"
- #: g10/pkclist.c:633
++#: g10/pkclist.c:648
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "�������������: ��� �������������� ���� �� ������!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " � �������� ������ ����� ������������.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
"������� ������������!\n"
- #: g10/pkclist.c:652
++#: g10/pkclist.c:667
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
- #: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ������������: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "�������� �������� ��� `%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
- #: g10/pkclist.c:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6489,168 -5218,132 +6551,168 @@@ msgstr "
"\n"
"�������������� �� user ID. ����� �� ��� ����� ������: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "��� ������� ���� �� user ID.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "�� ������� ������ ���� ���������������.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "������������: ������� ������ ���� ��� �������\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "������ ������ ���������\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "���������� ��������.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "�������� �� ����� ������� ���������: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "�������� ��� stdin ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "��� �������� ������������� ��������\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "�������� ��������� �������������� ��������� `%s'\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "�������� ���������� ������ �������� �������� %08lX ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "�������, ������� � �������� ����������.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "������ ������������ ��� DEK ��� �������������\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "� ���������� �������������� %d%s ����� �������� � �����������������\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "��������: � ���������� �������������� %d ��� ����� ���� ��������\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet �������: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "���� �������� ���:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(���� ����� ��� ��������� ������ ���������)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "�� ������� ������ ����� ���������.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "������������ ������ �� ����������� ASCII.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet �������: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "������������� ��������� �������������.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6659,20 -5352,17 +6721,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "������������� ��������� �������������.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "�� ������� ������ `%s' �� �������: %s\n"
@@@ -6680,23 -5370,19 +6742,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6715,82 -5401,66 +6777,82 @@@ msgstr "
"������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
"�������� ��� �� ��� ����� ��������� �� ������!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "�������"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "�������������� ��� ����������� �������� ����� �� ��� ����� ������:\n"
- #: g10/revoke.c:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "����� ��� ��������: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(��� ������ ���������)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "����� ���� �������; "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "������������� ������� ������ - ��������� �����������\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"�������� �������� �������� �������� ��� ���������� ��������������, ������ "
"��� %d �����!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "�������������: ��������� ��������� ��������� ��� ������\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, fuzzy, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
"�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
"������������\n"
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = ���������� ������������ �����������\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, fuzzy, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"�������������: �� ��������� ��������� %08lX ���� ����� ���' ������������� "
"�����������\n"
- #: g10/sig-check.c:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
@@@ -6799,7 -5469,6 +6861,7 @@@ msgstr[0] "
msgstr[1] ""
"�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
@@@ -6808,7 -5477,6 +6870,7 @@@ msgstr[0] "
msgstr[1] ""
"�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6821,7 -5489,6 +6883,7 @@@ msgstr[1] "
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6833,39 -5500,32 +6895,39 @@@ msgstr[1] "
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "��������: �� ������ ���� ���������"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, fuzzy, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
- #: g10/sig-check.c:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"�������������: �������� ���� %%-�������� ��������� (���� ������).\n"
" ����� �� ������������.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6873,7 -5533,6 +6935,7 @@@ msgstr "
"�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
" ����� �� ������������.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6882,12 -5541,10 +6944,12 @@@ msgstr "
"�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
" ����� �� ������������.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s �������� ���: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6895,43 -5552,35 +6957,43 @@@ msgstr "
"� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"����������� ��� ���������\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "��������:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s ������������� �� ��������������\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"�� ������ ��� ���� ��������� ��� ��������� - ��� ������ �� �������������� �� "
"������� RNG!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "������������ `%s': ������������\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "������������: ������� ������ ��� �����\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "������� trust %lu, ����� %d: write �������: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6940,340 -5589,274 +7002,340 @@@ msgstr "
"# ����� ��� ������������ ����� ������������, ������������� %s\n"
"# (����� ��� \"gpg --import-ownertrust\" ��� ��������� ����)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "� ������ ����� ���� ������\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "������: �� ������ ���������\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr "�������� ��� ����� ������������"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "������ ���� ������ ��� �������� ������������: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "������ ���������: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync �������: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "�������� ��������� ��� `%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: �������� lseek: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "���� ������ ��������� trustdb\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
- #, fuzzy, c-format
- msgid "can't access '%s': %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: � ������� ��� �������!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, fuzzy, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "�������� ����������� ��� `%s': %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: �������� ����������� ���� �������� �������: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ������������� �� ������ trustdb\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: ������������� � trustdb\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "��������: � trustdb ��� ����� ���������\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: �� ������ trustdb\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: �������� ����������� hashtable: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: ������ ���� ��������� ��� �������� �������: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: ������� lseek: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read ������� (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ��� ����� trustdb ������\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: ������� ������� �� recnum %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: �� ������ ������ ������� %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: ������������� � trustdb\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "�������� ��������� ������� �������� ����������� ��� %d ����������\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "������ ������� ���������� ��� %d ����������\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"��������������� ����������:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "�� ������� ������ %08lX ��� �������: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "��������: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "���������� ��� ������ ��������"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|����� [������]| ���������� ���������� ��� ���������"
msgstr[1] "|����� [������]| ���������� ���������� ��� ���������"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7283,175 -5866,155 +7345,186 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|����� [������]| ���������� ���������� ��� ���������"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "������ %08lX: ������� ��� ������ �� �����������\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, fuzzy, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "�� ������ %08lX ������� ���� ��� ��� ���� ���� trustdb\n"
- #: g10/trustdb.c:295
++#: g10/trustdb.c:294
#, fuzzy, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"������ %08lX: ������ ������� ������ ��� �� ������ �� ����������� - "
"���������\n"
- #: g10/trustdb.c:305
++#: g10/trustdb.c:304
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "�������� �������� ��� �������� ������������.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "������� trust %lu, req ����� %d: read �������: %s\n"
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
- #: g10/trustdb.c:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7460,7 -6022,6 +7533,7 @@@
msgid "no need for a trustdb check\n"
msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
@@@ -7508,35 -6061,28 +7581,35 @@@ msgid "public key of ultimately truste
msgstr ""
"�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "������� trust %lu, ����� %d: write �������: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
#, fuzzy
msgid "never"
msgstr "���� "
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7548,42 -6094,33 +7621,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "[����������]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "[�������]"
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "�������"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7593,12 -6130,10 +7666,12 @@@ msgstr "
"�������� ��� ������� ��� �� ������ ��������� (.sig or .asc)\n"
"������ �� ����� �� ����� ������ ��� ������ �������.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "�������� ��������� ��� `%s': %s\n"
@@@ -7927,7 -6394,6 +8000,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8072,9 -6508,6 +8145,9 @@@ msgstr "������ ��� ���������� ��� �����
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
@@@ -8583,7 -6911,6 +8656,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
@@@ -8608,134 -6931,104 +8681,134 @@@ msgstr "�������� block �������� �������
msgid "no valid recipients given\n"
msgstr "(��� ������ ���������)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "���������� ��� ������ �������� ��������"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "���� �������������"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "���� �������������"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "���� �������������"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "���������� ascii ������������ ������"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "�� ����� ����������"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "��������� batch: �� �� �������� ���������"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "�������� ��� ���� ������������ ���������"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "�������� ��� ���� ������������ ���������"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|�����|����� �������� ��� �������������� ������� ������"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|�����|����� ���������� �������������� �����"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|�����|����� ���������� ��������� ��������� ����� "
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8746,47 -7039,38 +8819,47 @@@ msgstr "
"��������, �������, ������������� � ����������������\n"
"� �������������� ���������� ��������� ��� �� �������� �������\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "�������� �������� ��� `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(��� ������ ���������)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = ��������� ����� ��� ��������\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "������� ��� `%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8804,7 -7085,6 +8877,7 @@@ msgstr "���������� ���� ��������������
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@@ -8819,32 -7097,26 +8892,32 @@@ msgstr "������ ��� ���������� ��� �����
msgid "error reading input: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? �������� ���� ������ ���������: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@@ -9023,7 -7262,6 +9096,7 @@@ msgstr "���� �������������
msgid " runtime cached certificates: %u\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "������������� ��������� �������������.\n"
@@@ -9033,8 -7270,6 +9106,8 @@@
msgid "certificate cached\n"
msgstr "� ���������� %c%lu ������������\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@@ -9645,13 -7757,11 +9718,13 @@@ msgstr "���� �������������
msgid "force the use of the default OCSP responder"
msgstr "�������������� �� user ID ��� ����������� ��������: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9659,85 -7769,69 +9732,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "� ���������� %c%lu ������������\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "��������: �� ������ ���� ���������"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"��������������� ����������:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9892,12 -7952,10 +9965,12 @@@ msgstr "�����: gpg [��������]
msgid "colons are not allowed in the socket name\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
@@@ -10392,77 -8348,61 +10465,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "� �������� �������: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "� �������� �������: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: �������� ����������� hashtable: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "�������� ������������ ��� cache �����������: %s\n"
- #: dirmngr/server.c:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/en at boldquot.po
index 1ce2c96,0000000..7ca3f09
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,10518 -1,0 +1,10598 @@@
+# English translations for GNU gnupg package.
+# Copyright (C) 2016 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU gnupg package.
+# Automatically generated, 2016.
+#
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
+msgid ""
+msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.11\n"
++"Project-Id-Version: GNU gnupg 2.1.12\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
- "PO-Revision-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
++"PO-Revision-Date: 2016-05-04 15:58+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agent/call-pinentry.c:257
+#, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "failed to acquire the pinentry lock: %s\n"
+
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries. An underscore indicates that the next letter
+#. should be used as an accelerator. Double the underscore for
+#. a literal one. The actual to be translated text starts after
+#. the second vertical bar. Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
+#: agent/call-pinentry.c:447
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
+#: agent/call-pinentry.c:448
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
+#: agent/call-pinentry.c:449
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
+#: agent/call-pinentry.c:450
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
+#: agent/call-pinentry.c:451
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
+#: agent/call-pinentry.c:452
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
+#: agent/call-pinentry.c:453
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Do you really want to make your passphrase visible on the screen?"
+
+#: agent/call-pinentry.c:455
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
+#: agent/call-pinentry.c:456
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "|pinentry-tt|Hide passphrase"
+
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:736
+msgid "Quality:"
+msgstr "Quality:"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar. Please use an appropriate
+#. string to describe what this is about. The length of the
+#. tooltip is limited to about 900 characters. If you do not
+#. translate this entry, a default english text (see source)
+#. will be used.
+#: agent/call-pinentry.c:758
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
+#: agent/call-pinentry.c:868
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+
+#: agent/call-pinentry.c:871
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
+msgid "PIN:"
+msgstr "PIN:"
+
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
+#: agent/call-pinentry.c:938 agent/command-ssh.c:3237 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:959
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
+#: agent/call-pinentry.c:971
+msgid "Repeat:"
+msgstr "Repeat:"
+
+#: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
+msgid "PIN too long"
+msgstr "PIN too long"
+
+#: agent/call-pinentry.c:1002
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
+#: agent/call-pinentry.c:1010
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
+#: agent/call-pinentry.c:1015
+msgid "PIN too short"
+msgstr "PIN too short"
+
+#: agent/call-pinentry.c:1028
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
+#: agent/call-pinentry.c:1028
+msgid "Bad Passphrase"
+msgstr "Bad Passphrase"
+
+#: agent/command-ssh.c:651 agent/command-ssh.c:746
+#, c-format
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "ssh keys greater than %d bits are not supported\n"
+
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
+#, c-format
+msgid "can't create '%s': %s\n"
+msgstr "can't create '%s': %s\n"
+
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1668
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
+#: agent/command-ssh.c:2535 agent/command-ssh.c:2553
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error getting serial number of card: %s\n"
+
+#: agent/command-ssh.c:2539
+#, c-format
+msgid "detected card with S/N: %s\n"
+msgstr "detected card with S/N: %s\n"
+
+#: agent/command-ssh.c:2544
+#, c-format
+msgid "no authentication key for ssh on card: %s\n"
+msgstr "no authentication key for ssh on card: %s\n"
+
+#: agent/command-ssh.c:2564
+#, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "no suitable card key found: %s\n"
+
+#: agent/command-ssh.c:2614
+#, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "shadowing the key failed: %s\n"
+
+#: agent/command-ssh.c:2629
+#, c-format
+msgid "error writing key: %s\n"
+msgstr "error writing key: %s\n"
+
+#: agent/command-ssh.c:2912
+#, c-format
+msgid ""
+"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
+"allow this?"
+msgstr ""
+"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
+"allow this?"
+
+#: agent/command-ssh.c:2919
+msgid "Allow"
+msgstr "Allow"
+
+#: agent/command-ssh.c:2919
+msgid "Deny"
+msgstr "Deny"
+
+#: agent/command-ssh.c:2928
+#, c-format
+msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
+msgstr "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
+
+#: agent/command-ssh.c:3167 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
+#: agent/command-ssh.c:3192
+#, c-format
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
+"%s%%0Awithin gpg-agent's key storage"
+msgstr ""
+"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
+"%s%%0Awithin gpg-agent's key storage"
+
+#: agent/command-ssh.c:3712
+#, 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
+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:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
+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:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 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:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
+msgid "verbose"
+msgstr "verbose"
+
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
+msgid "csh-style command output"
+msgstr "csh-style command output"
+
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|read options from FILE"
+
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 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:166
++#: agent/gpg-agent.c:167
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
+msgid "use a log file for the server"
+msgstr "use a log file for the server"
+
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “[1mtrusted[0m”"
+
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
- msgstr "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
++msgid "disallow caller to override the pinentry"
++msgstr "disallow caller to override the pinentry"
+
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
+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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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:480
++#: agent/gpg-agent.c:482
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
+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:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: 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:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: dirmngr/dirmngr.c:908
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
+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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
+#, c-format
+msgid "listen() failed: %s\n"
+msgstr "listen() failed: %s\n"
+
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
+#, c-format
+msgid "directory '%s' created\n"
+msgstr "directory ‘[1m%s[0m’ created\n"
+
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
++#, c-format
++msgid "can't set permissions of '%s': %s\n"
++msgstr "can't set permissions of '%s': %s\n"
++
++#: agent/gpg-agent.c:1964
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
+#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
+#, 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:2392
++#: agent/gpg-agent.c:2400
+#, 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:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
+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
++#: agent/protect-tool.c:157
+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
++#: agent/protect-tool.c:705
+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
++#: agent/protect-tool.c:710
+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
++#: agent/protect-tool.c:716
+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
++#: agent/protect-tool.c:721
+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
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
+msgid "cancelled\n"
+msgstr "cancelled\n"
+
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 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: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
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: 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
++#: agent/findkey.c:251
+#, 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
++#: agent/findkey.c:267
+#, 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
++#: agent/findkey.c:281 agent/findkey.c:288
+msgid "Change passphrase"
+msgstr "Change passphrase"
+
- #: agent/findkey.c:175
++#: agent/findkey.c:289
+msgid "I'll change it later"
+msgstr "I'll change it later"
+
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
+#, 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
++#: agent/findkey.c:1449 agent/findkey.c:1463
+msgid "Delete key"
+msgstr "Delete key"
+
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
+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
++#: agent/pksign.c:176 g10/seskey.c:290 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
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: 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
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#, 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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 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
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+#, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "waiting for process %d to terminate failed: %s\n"
++msgid "waiting for processes to terminate failed: %s\n"
++msgstr "waiting for processes to terminate failed: %s\n"
+
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
+#, 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
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
+#, c-format
+msgid "error running '%s': exit status %d\n"
+msgstr "error running '%s': exit status %d\n"
+
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
+#, c-format
+msgid "error running '%s': terminated\n"
+msgstr "error running '%s': terminated\n"
+
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
+#, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "error getting exit code of process %d: %s\n"
+
++#: common/exechelp-w32ce.c:760
++#, c-format
++msgid "waiting for process %d to terminate failed: %s\n"
++msgstr "waiting for process %d to terminate failed: %s\n"
++
+#: common/simple-pwquery.c: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
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
+msgid "canceled by user\n"
+msgstr "canceled by user\n"
+
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
+msgid "problem with the agent\n"
+msgstr "problem with the agent\n"
+
++#: common/simple-pwquery.c:697
++#, c-format
++msgid "problem with the agent (unexpected response \"%s\")\n"
++msgstr "problem with the agent (unexpected response “[1m%s[0m”)\n"
++
+#: common/sysutils.c:124
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "can't disable core dumps: %s\n"
+
+#: common/sysutils.c:219
+#, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "Warning: unsafe ownership on %s “[1m%s[0m”\n"
+
+#: common/sysutils.c:251
+#, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Warning: unsafe permissions on %s “[1m%s[0m”\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:45 common/yesno.c:82
+msgid "yes"
+msgstr "yes"
+
+#: common/yesno.c:46 common/yesno.c:87
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:48 common/yesno.c:84
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:49 common/yesno.c:88
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:86
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:89
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:123
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:125
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: common/yesno.c:126
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:127
+msgid "cC"
+msgstr "cC"
+
+#: common/miscellaneous.c:86
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr "out of core in secure memory while allocating %lu bytes"
+
+#: common/miscellaneous.c:89
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr "out of core while allocating %lu bytes"
+
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#, c-format
++msgid "error allocating enough memory: %s\n"
++msgstr "error allocating enough memory: %s\n"
++
++#: common/miscellaneous.c:143
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: obsolete option “[1m%s[0m” - it has no effect\n"
+
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "WARNING: “[1m%s%s[0m” is an obsolete option - it has no effect\n"
+
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr "unknown debug flag ‘[1m%s[0m’ ignored\n"
+
+#: common/asshelp.c:411
+#, c-format
+msgid "no running gpg-agent - starting '%s'\n"
+msgstr "no running gpg-agent - starting ‘[1m%s[0m’\n"
+
+#: common/asshelp.c:471
+#, 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:479
+msgid "connection to agent established\n"
+msgstr "connection to agent established\n"
+
+#: common/asshelp.c:519
+msgid "connection to agent is in restricted mode\n"
+msgstr "connection to agent is in restricted mode\n"
+
+#: common/asshelp.c:601
+#, c-format
+msgid "no running Dirmngr - starting '%s'\n"
+msgstr "no running Dirmngr - starting ‘[1m%s[0m’\n"
+
+#: common/asshelp.c:658
+#, 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:667
+msgid "connection to the dirmngr established\n"
+msgstr "connection to the dirmngr established\n"
+
+#. TRANSLATORS: Copy the prefix between the vertical bars
+#. verbatim. It will not be printed.
+#: common/audit.c:474
+msgid "|audit-log-result|Good"
+msgstr "|audit-log-result|Good"
+
+#: common/audit.c:477
+msgid "|audit-log-result|Bad"
+msgstr "|audit-log-result|Bad"
+
+#: common/audit.c:479
+msgid "|audit-log-result|Not supported"
+msgstr "|audit-log-result|Not supported"
+
+#: common/audit.c:481
+msgid "|audit-log-result|No certificate"
+msgstr "|audit-log-result|No certificate"
+
+#: common/audit.c:483
+msgid "|audit-log-result|Not enabled"
+msgstr "|audit-log-result|Not enabled"
+
+#: common/audit.c:485
+msgid "|audit-log-result|Error"
+msgstr "|audit-log-result|Error"
+
+#: common/audit.c:487
+msgid "|audit-log-result|Not used"
+msgstr "|audit-log-result|Not used"
+
+#: common/audit.c:489
+msgid "|audit-log-result|Okay"
+msgstr "|audit-log-result|Okay"
+
+#: common/audit.c:491
+msgid "|audit-log-result|Skipped"
+msgstr "|audit-log-result|Skipped"
+
+#: common/audit.c:493
+msgid "|audit-log-result|Some"
+msgstr "|audit-log-result|Some"
+
+#: common/audit.c:726
+msgid "Certificate chain available"
+msgstr "Certificate chain available"
+
+#: common/audit.c:733
+msgid "root certificate missing"
+msgstr "root certificate missing"
+
+#: common/audit.c:759
+msgid "Data encryption succeeded"
+msgstr "Data encryption succeeded"
+
+#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
+msgid "Data available"
+msgstr "Data available"
+
+#: common/audit.c:767
+msgid "Session key created"
+msgstr "Session key created"
+
+#: common/audit.c:772 common/audit.c:912 common/audit.c:919
+#, c-format
+msgid "algorithm: %s"
+msgstr "algorithm: %s"
+
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
+#: scd/app-openpgp.c:2885
+#, c-format
+msgid "unsupported algorithm: %s"
+msgstr "unsupported algorithm: %s"
+
+#: common/audit.c:778 common/audit.c:925
+msgid "seems to be not encrypted"
+msgstr "seems to be not encrypted"
+
+#: common/audit.c:784 common/audit.c:933
+msgid "Number of recipients"
+msgstr "Number of recipients"
+
+#: common/audit.c:792 common/audit.c:956
+#, c-format
+msgid "Recipient %d"
+msgstr "Recipient %d"
+
+#: common/audit.c:825
+msgid "Data signing succeeded"
+msgstr "Data signing succeeded"
+
+#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
+#, c-format
+msgid "data hash algorithm: %s"
+msgstr "data hash algorithm: %s"
+
+#: common/audit.c:862
+#, c-format
+msgid "Signer %d"
+msgstr "Signer %d"
+
+#: common/audit.c:866 common/audit.c:1065
+#, c-format
+msgid "attr hash algorithm: %s"
+msgstr "attr hash algorithm: %s"
+
+#: common/audit.c:901
+msgid "Data decryption succeeded"
+msgstr "Data decryption succeeded"
+
+#: common/audit.c:910
+msgid "Encryption algorithm supported"
+msgstr "Encryption algorithm supported"
+
+#: common/audit.c:993
+msgid "Data verification succeeded"
+msgstr "Data verification succeeded"
+
+#: common/audit.c:1002
+msgid "Signature available"
+msgstr "Signature available"
+
+#: common/audit.c:1024
+msgid "Parsing data succeeded"
+msgstr "Parsing data succeeded"
+
+#: common/audit.c:1036
+#, c-format
+msgid "bad data hash algorithm: %s"
+msgstr "bad data hash algorithm: %s"
+
+#: common/audit.c:1051
+#, c-format
+msgid "Signature %d"
+msgstr "Signature %d"
+
+#: common/audit.c:1079
+msgid "Certificate chain valid"
+msgstr "Certificate chain valid"
+
+#: common/audit.c:1090
+msgid "Root certificate trustworthy"
+msgstr "Root certificate trustworthy"
+
+#: common/audit.c:1111 sm/certchain.c:991
+msgid "no CRL found for certificate"
+msgstr "no CRL found for certificate"
+
+#: common/audit.c:1114 sm/certchain.c:1001
+msgid "the available CRL is too old"
+msgstr "the available CRL is too old"
+
+#: common/audit.c:1119
+msgid "CRL/OCSP check of certificates"
+msgstr "CRL/OCSP check of certificates"
+
+#: common/audit.c:1139
+msgid "Included certificates"
+msgstr "Included certificates"
+
+#: common/audit.c:1194
+msgid "No audit log entries."
+msgstr "No audit log entries."
+
+#: common/audit.c:1243
+msgid "Unknown operation"
+msgstr "Unknown operation"
+
+#: common/audit.c:1261
+msgid "Gpg-Agent usable"
+msgstr "Gpg-Agent usable"
+
+#: common/audit.c:1271
+msgid "Dirmngr usable"
+msgstr "Dirmngr usable"
+
+#: common/audit.c:1307
+#, c-format
+msgid "No help available for '%s'."
+msgstr "No help available for '%s'."
+
+#: common/helpfile.c:90
+msgid "ignoring garbage line"
+msgstr "ignoring garbage line"
+
+#: common/gettime.c: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 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 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
++#: common/utf8conv.c:123
+#, c-format
+msgid "conversion from '%s' to '%s' not available\n"
+msgstr "conversion from ‘[1m%s[0m’ to ‘[1m%s[0m’ not available\n"
+
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
+#, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "iconv_open failed: %s\n"
+
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
+#, c-format
+msgid "conversion from '%s' to '%s' failed: %s\n"
+msgstr "conversion from ‘[1m%s[0m’ to ‘[1m%s[0m’ failed: %s\n"
+
+#: common/dotlock.c:707
+#, c-format
+msgid "failed to create temporary file '%s': %s\n"
+msgstr "failed to create temporary file '%s': %s\n"
+
+#: common/dotlock.c:771
+#, c-format
+msgid "error writing to '%s': %s\n"
+msgstr "error writing to '%s': %s\n"
+
+#: common/dotlock.c:1116
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr "removing stale lockfile (created by %d)\n"
+
+#: common/dotlock.c:1152
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "waiting for lock (held by %d%s) %s...\n"
+
+#: common/dotlock.c:1153
+msgid "(deadlock?) "
+msgstr "(deadlock?) "
+
+#: common/dotlock.c:1192
+#, c-format
+msgid "lock '%s' not made: %s\n"
+msgstr "lock ‘[1m%s[0m’ not made: %s\n"
+
+#: common/dotlock.c:1219
+#, c-format
+msgid "waiting for lock %s...\n"
+msgstr "waiting for lock %s...\n"
+
- #: g10/armor.c:377
++#: g10/armor.c:417
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
- #: g10/armor.c:416
++#: g10/armor.c:456
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
- #: g10/armor.c:427
++#: g10/armor.c:467
+msgid "armor header: "
+msgstr "armor header: "
+
- #: g10/armor.c:440
++#: g10/armor.c:480
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
- #: g10/armor.c:453
++#: g10/armor.c:493
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
- #: g10/armor.c:506
++#: g10/armor.c:546
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
- #: g10/armor.c:641
++#: g10/armor.c:681
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
- #: g10/armor.c:654
++#: g10/armor.c:694
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
- #: g10/armor.c:851
++#: g10/armor.c:909
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
- #: g10/armor.c:885
++#: g10/armor.c:943
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
- #: g10/armor.c:893
++#: g10/armor.c:951
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
- #: g10/armor.c:917
++#: g10/armor.c:975
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
- #: g10/armor.c:921
++#: g10/armor.c:979
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
- #: g10/armor.c:1238
++#: g10/armor.c:1296
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
- #: g10/armor.c:1243
++#: g10/armor.c:1301
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
- #: g10/armor.c:1247
++#: g10/armor.c:1305
+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
++#: g10/build-packet.c:1091
++#, c-format
++msgid "[ not human readable (%zu bytes: %s%s) ]"
++msgstr "[ not human readable (%zu bytes: %s%s) ]"
++
++#: g10/build-packet.c:1143
+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
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
+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
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
+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
++#: g10/build-packet.c:1179
+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
++#: g10/build-packet.c:1235
++msgid "a notation name may not contain an '=' character\n"
++msgstr "a notation name may not contain an ‘[1m=[0m’ character\n"
++
++#: g10/build-packet.c:1241
++msgid "a notation name must have only printable characters or spaces\n"
++msgstr "a notation name must have only printable characters or spaces\n"
++
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
+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:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
+#, c-format
+msgid "failed to proxy %s inquiry to client\n"
+msgstr "failed to proxy %s inquiry to client\n"
+
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
+#, c-format
+msgid "error getting version from '%s': %s\n"
+msgstr "error getting version from '%s': %s\n"
+
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
+#, c-format
+msgid "server '%s' is older than us (%s < %s)"
+msgstr "server ‘[1m%s[0m’ is older than us (%s < %s)"
+
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
+#, c-format
+msgid "WARNING: %s\n"
+msgstr "WARNING: %s\n"
+
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
+#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
+#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
+msgid "can't do this in batch mode\n"
+msgstr "can't do this in batch mode\n"
+
- #: g10/card-util.c:108
++#: g10/card-util.c:107
+msgid "This command is only available for version 2 cards\n"
+msgstr "This command is only available for version 2 cards\n"
+
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
+msgid "Reset Code not or not anymore available\n"
+msgstr "Reset Code not or not anymore available\n"
+
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
+msgid "Your selection? "
+msgstr "Your selection? "
+
+#: g10/card-util.c:279 g10/card-util.c:330
+msgid "[not set]"
+msgstr "[not set]"
+
+#: g10/card-util.c:533
+msgid "male"
+msgstr "male"
+
+#: g10/card-util.c:534
+msgid "female"
+msgstr "female"
+
+#: g10/card-util.c:534
+msgid "unspecified"
+msgstr "unspecified"
+
+#: g10/card-util.c:561
+msgid "not forced"
+msgstr "not forced"
+
+#: g10/card-util.c:561
+msgid "forced"
+msgstr "forced"
+
+#: g10/card-util.c:636
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
+#: g10/card-util.c:638
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “[1m<[0m” character may not be used.\n"
+
+#: g10/card-util.c:640
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
+#: g10/card-util.c:657
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
+#: g10/card-util.c:659
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
+#: g10/card-util.c:677
+#, c-format
+msgid "Error: Combined name too long (limit is %d characters).\n"
+msgstr "Error: Combined name too long (limit is %d characters).\n"
+
+#: g10/card-util.c:698
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
+#: g10/card-util.c:706
+#, c-format
+msgid "Error: URL too long (limit is %d characters).\n"
+msgstr "Error: URL too long (limit is %d characters).\n"
+
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
+#: g10/card-util.c:871
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
+#: g10/card-util.c:881
+#, 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:917
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
+#: g10/card-util.c:927
+#, 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:1010
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
+#: g10/card-util.c:1018
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
+#: g10/card-util.c:1027
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
+#: g10/card-util.c:1049
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
+#: g10/card-util.c:1063
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
+#: g10/card-util.c:1085
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
+#: g10/card-util.c:1108
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
+#: g10/card-util.c:1158
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
+#: g10/card-util.c:1159
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
+#: g10/card-util.c:1172
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
+#: g10/card-util.c:1259
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
+#: g10/card-util.c:1276
+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:1301
+#, 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:1303
+#, 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:1304
+#, 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:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: 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:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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:1328
+#, 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:1348
+#, 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:1372
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
+#: g10/card-util.c:1386
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
+#: g10/card-util.c:1389
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
+#: g10/card-util.c:1401
+#, 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:1458
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
+#: g10/card-util.c:1460 g10/card-util.c:1571
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
+#: g10/card-util.c:1461 g10/card-util.c:1573
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
+#: g10/card-util.c:1462 g10/card-util.c:1575
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
+#: g10/card-util.c:1568
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
+#: g10/card-util.c:1614
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
+#: g10/card-util.c:1710
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
+#: g10/card-util.c:1715
+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:1718
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
+#: g10/card-util.c:1723
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “[1myes[0m”) "
+
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
+msgid "quit this menu"
+msgstr "quit this menu"
+
+#: g10/card-util.c:1811
+msgid "show admin commands"
+msgstr "show admin commands"
+
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
+msgid "show this help"
+msgstr "show this help"
+
+#: g10/card-util.c:1814
+msgid "list all available data"
+msgstr "list all available data"
+
+#: g10/card-util.c:1817
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
+#: g10/card-util.c:1818
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
+#: g10/card-util.c:1819
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
+#: g10/card-util.c:1820
+msgid "change the login name"
+msgstr "change the login name"
+
+#: g10/card-util.c:1821
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
+#: g10/card-util.c:1822
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
+#: g10/card-util.c:1823
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
+#: g10/card-util.c:1824
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
+#: g10/card-util.c:1825
+msgid "generate new keys"
+msgstr "generate new keys"
+
+#: g10/card-util.c:1826
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
+#: g10/card-util.c:1827
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
+#: g10/card-util.c:1828
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
+#: g10/card-util.c:1829
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
+#: g10/card-util.c:1951
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
+#: g10/card-util.c:1992
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
+#: g10/card-util.c:2023
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
+#: g10/card-util.c:2025
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “[1mhelp[0m”)\n"
+
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
+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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
+#, c-format
+msgid "can't open '%s'\n"
+msgstr "can't open ‘[1m%s[0m’\n"
+
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “[1m%s[0m” not found: %s\n"
+
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
+#, c-format
+msgid "key \"%s\" not found\n"
+msgstr "key “[1m%s[0m” not found\n"
+
- #: g10/delkey.c:130 g10/delkey.c:137
++#: g10/delkey.c:129 g10/delkey.c:136
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(unless you specify the key by fingerprint)\n"
+
- #: g10/delkey.c:136
++#: g10/delkey.c:135
+msgid "can't do this in batch mode without \"--yes\"\n"
+msgstr "can't do this in batch mode without “[1m--yes[0m”\n"
+
- #: g10/delkey.c:149
++#: g10/delkey.c:148
+msgid "Delete this key from the keyring? (y/N) "
+msgstr "Delete this key from the keyring? (y/N) "
+
- #: g10/delkey.c:159
++#: g10/delkey.c:158
+msgid "This is a secret key! - really delete? (y/N) "
+msgstr "This is a secret key! - really delete? (y/N) "
+
- #: g10/delkey.c:196
++#: g10/delkey.c:195
+#, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "deleting secret %s failed: %s\n"
+
- #: g10/delkey.c:198
++#: g10/delkey.c:197
+msgid "key"
+msgstr "key"
+
- #: g10/delkey.c:198
++#: g10/delkey.c:197
+msgid "subkey"
+msgstr "subkey"
+
- #: g10/delkey.c:221
++#: g10/delkey.c:220
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
- #: g10/delkey.c:234
++#: g10/delkey.c:233
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
- #: g10/delkey.c:270
++#: g10/delkey.c:269
+#, 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:272
++#: g10/delkey.c:271
+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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
+
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘[1m%s[0m’ already compressed\n"
+
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘[1m%s[0m’ is an empty file\n"
+
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘[1m%s[0m’\n"
+
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 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:811
++#: g10/encrypt.c:818
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, 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:910
++#: g10/encrypt.c:904
+#, 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
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
++#, c-format
++msgid "you may not use %s while in %s mode\n"
++msgstr "you may not use %s while in %s mode\n"
++
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
+#, 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
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
+msgid "problem handling encrypted packet\n"
+msgstr "problem handling encrypted packet\n"
+
+#: g10/exec.c:60
+msgid "no remote program execution supported\n"
+msgstr "no remote program execution supported\n"
+
+#: g10/exec.c:319
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"external program calls are disabled due to unsafe options file permissions\n"
+
+#: g10/exec.c:349
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr ""
+"this platform requires temporary files when calling external programs\n"
+
+#: g10/exec.c:427
+#, c-format
+msgid "unable to execute program '%s': %s\n"
+msgstr "unable to execute program '%s': %s\n"
+
+#: g10/exec.c:430
+#, c-format
+msgid "unable to execute shell '%s': %s\n"
+msgstr "unable to execute shell '%s': %s\n"
+
+#: g10/exec.c:521
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "system error while calling external program: %s\n"
+
+#: g10/exec.c:532 g10/exec.c:599
+msgid "unnatural exit of external program\n"
+msgstr "unnatural exit of external program\n"
+
+#: g10/exec.c:547
+msgid "unable to execute external program\n"
+msgstr "unable to execute external program\n"
+
+#: g10/exec.c:564
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "unable to read external program response: %s\n"
+
+#: g10/exec.c:610 g10/exec.c:617
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+
+#: g10/exec.c:622
+#, c-format
+msgid "WARNING: unable to remove temp directory '%s': %s\n"
+msgstr "WARNING: unable to remove temp directory '%s': %s\n"
+
- #: g10/export.c:79
++#: g10/export.c:78
+msgid "export signatures that are marked as local-only"
+msgstr "export signatures that are marked as local-only"
+
- #: g10/export.c:81
++#: g10/export.c:80
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "export attribute user IDs (generally photo IDs)"
+
- #: g10/export.c:83
++#: g10/export.c:82
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "export revocation keys marked as “[1msensitive[0m”"
+
- #: g10/export.c:85
++#: g10/export.c:84
+msgid "remove unusable parts from key during export"
+msgstr "remove unusable parts from key during export"
+
- #: g10/export.c:87
++#: g10/export.c:86
+msgid "remove as much as possible from key during export"
+msgstr "remove as much as possible from key during export"
+
- #: g10/export.c:896
++#: g10/export.c:895
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:976
++#: g10/export.c:975
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
- #: g10/export.c:1054
++#: g10/export.c:1053
+#, 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:1241
++#: g10/export.c:1240
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
- #: g10/export.c:1352
++#: g10/export.c:1351
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error creating '%s': %s\n"
+
- #: g10/getkey.c:245
++#: g10/getkey.c:244
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
+#, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "(check argument of option '%s')\n"
+
- #: g10/getkey.c:504
++#: g10/getkey.c:503
+#, c-format
+msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
+msgstr "Warning: ‘[1m%s[0m’ should be a long key ID or a fingerprint\n"
+
- #: g10/getkey.c:534
++#: g10/getkey.c:533
+#, c-format
+msgid "error looking up: %s\n"
+msgstr "error looking up: %s\n"
+
- #: g10/getkey.c:624
++#: g10/getkey.c:623
+#, c-format
+msgid "Warning: %s appears in the keyring %d times\n"
+msgstr "Warning: %s appears in the keyring %d times\n"
+
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘[1m%s[0m’ via %s\n"
+
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘[1m%s[0m’ via %s: %s\n"
+
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “[1m%s[0m” not found: %s\n"
+
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
+#, c-format
+msgid "Warning: not using '%s' as default key: %s\n"
+msgstr "Warning: not using ‘[1m%s[0m’ as default key: %s\n"
+
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
+#, c-format
+msgid "using \"%s\" as default secret key for signing\n"
+msgstr "using “[1m%s[0m” as default secret key for signing\n"
+
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘[1m%s[0m’ ignored\n"
+
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
+#, 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:3296
++#: g10/getkey.c:3301
+#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
+msgid "make a signature"
+msgstr "make a signature"
+
+#: g10/gpg.c:407
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
+msgid "encrypt data"
+msgstr "encrypt data"
+
+#: g10/gpg.c:411
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
+msgid "list keys"
+msgstr "list keys"
+
+#: g10/gpg.c:419
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
+#: g10/gpg.c:420
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
+#: g10/gpg.c:426
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
+#: g10/gpg.c:428
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
+#: g10/gpg.c:430
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
+#: g10/gpg.c:431
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
+#: g10/gpg.c:435
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
+#: g10/gpg.c:437
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
+#: g10/gpg.c:439
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
+#: g10/gpg.c:440
+msgid "sign a key"
+msgstr "sign a key"
+
+#: g10/gpg.c:441
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
+#: g10/gpg.c:442
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
+#: g10/gpg.c:446
+msgid "export keys"
+msgstr "export keys"
+
+#: g10/gpg.c:447
+msgid "export keys to a key server"
+msgstr "export keys to a key server"
+
+#: g10/gpg.c:448
+msgid "import keys from a key server"
+msgstr "import keys from a key server"
+
+#: g10/gpg.c:450
+msgid "search for keys on a key server"
+msgstr "search for keys on a key server"
+
+#: g10/gpg.c:452
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
+#: g10/gpg.c:458
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
+#: g10/gpg.c:461
+msgid "print the card status"
+msgstr "print the card status"
+
+#: g10/gpg.c:462
+msgid "change data on a card"
+msgstr "change data on a card"
+
+#: g10/gpg.c:463
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
+#: g10/gpg.c:475
+msgid "update the trust database"
+msgstr "update the trust database"
+
+#: g10/gpg.c:484
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
+msgid "run in server mode"
+msgstr "run in server mode"
+
+#: g10/gpg.c:489
- 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)"
++msgid "|VALUE|set the TOFU policy for a key"
++msgstr "|VALUE|set the TOFU policy for a key"
+
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|use USER-ID to sign or decrypt"
+
+#: g10/gpg.c:515
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
+#: g10/gpg.c:521
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
+#: g10/gpg.c:551
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
+#: g10/gpg.c:596
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file] sign and encrypt for user Bob\n"
+" --clearsign [file] make a clear text signature\n"
+" --detach-sign [file] make a detached signature\n"
+" --list-keys [names] show keys\n"
+" --fingerprint [names] show fingerprints\n"
+msgstr ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file] sign and encrypt for user Bob\n"
+" --clearsign [file] make a clear text signature\n"
+" --detach-sign [file] make a detached signature\n"
+" --list-keys [names] show keys\n"
+" --fingerprint [names] show fingerprints\n"
+
- #: g10/gpg.c:985
++#: g10/gpg.c:988
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:988
++#: g10/gpg.c:991
+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:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
+#, 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:1507
++#: g10/gpg.c:1510
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
+#, 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:1513
++#: g10/gpg.c:1516
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
+#, 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:1525
++#: g10/gpg.c:1528
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
+#, 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:1534
++#: g10/gpg.c:1537
+#, 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:1537
++#: g10/gpg.c:1540
+#, 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:1543
++#: g10/gpg.c:1546
+#, 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:1546
++#: g10/gpg.c:1549
+#, 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:1549
++#: g10/gpg.c:1552
+#, 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:1756
++#: g10/gpg.c:1759
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
+msgid "available TOFU policies:\n"
+msgstr "available TOFU policies:\n"
+
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "unknown TOFU policy ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “[1mhelp[0m” to list choices)\n"
+
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
+#, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "unknown TOFU DB format ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
+#, 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:2182
++#: g10/gpg.c:2185
+#, 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:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
+#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
+#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
+#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
+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:3515
++#: g10/gpg.c:3522
+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:3517
++#: g10/gpg.c:3524
+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:3520
++#: g10/gpg.c:3527
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3524
++#: g10/gpg.c:3531
+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:3531
++#: g10/gpg.c:3538
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
+#, 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:3631
++#: g10/gpg.c:3638
+#, 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:3636
++#: g10/gpg.c:3643
+#, 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:3729
++#: g10/gpg.c:3736
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
+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:3796
++#: g10/gpg.c:3803
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘[1m%s[0m’ failed: %s\n"
+
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [filename]"
+
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
+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:3842
++#: g10/gpg.c:3849
+#, 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:3863
++#: g10/gpg.c:3870
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [filename]"
+
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
+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:3902
++#: g10/gpg.c:3909
+#, 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:3926
++#: g10/gpg.c:3933
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
+msgid "--passwd <user-id>"
+msgstr "--passwd <user-id>"
+
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error parsing key specification '%s': %s\n"
+
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
+#, 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:4596
++#: g10/gpg.c:4603
+msgid "[filename]"
+msgstr "[filename]"
+
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
+#: g10/gpgv.c:75
+msgid "|FILE|take the keys from the keyring FILE"
+msgstr "|FILE|take the keys from the keyring FILE"
+
+#: g10/gpgv.c:77
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
+msgid "|FD|write status info to this FD"
+msgstr "|FD|write status info to this FD"
+
+#: g10/gpgv.c:119
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
+#: 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:105
++#: 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:108
++#: 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:111
++#: 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:114
++#: g10/import.c:113
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
- #: g10/import.c:117
++#: g10/import.c:116
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
- #: g10/import.c:120
++#: g10/import.c:119
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
- #: g10/import.c:123
++#: 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:344
++#: g10/import.c:343
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
- #: g10/import.c:361
++#: g10/import.c:360
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
- #: g10/import.c:431
++#: g10/import.c:430
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
- #: g10/import.c:434
++#: g10/import.c:433
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
- #: g10/import.c:436
++#: g10/import.c:435
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
- #: g10/import.c:439
++#: g10/import.c:438
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
- #: g10/import.c:448
++#: g10/import.c:447
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
- #: g10/import.c:450
++#: g10/import.c:449
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
- #: g10/import.c:452
++#: g10/import.c:451
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
- #: g10/import.c:454
++#: g10/import.c:453
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 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
++#: g10/import.c:457 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
++#: g10/import.c:459 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
++#: g10/import.c:461 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
- #: g10/import.c:464
++#: g10/import.c:463
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
- #: g10/import.c:466
++#: g10/import.c:465
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
- #: g10/import.c:810
++#: g10/import.c:809
+#, 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:852
++#: g10/import.c:851
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for cipher algorithm %s\n"
+
- #: g10/import.c:867
++#: g10/import.c:866
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for digest algorithm %s\n"
+
- #: g10/import.c:879
++#: g10/import.c:878
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for compression algorithm %s\n"
+
- #: g10/import.c:892
++#: g10/import.c:891
+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:894
++#: g10/import.c:893
+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:919
++#: g10/import.c:918
+#, 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:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
- #: g10/import.c:989
++#: g10/import.c:988
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
- #: g10/import.c:1020
++#: g10/import.c:1019
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
- #: g10/import.c:1036
++#: g10/import.c:1035
+#, 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:1046
++#: g10/import.c:1045
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
- #: g10/import.c:1048
++#: g10/import.c:1047
+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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
- #: g10/import.c:1067
++#: g10/import.c:1066
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
- #: g10/import.c:1082
++#: g10/import.c:1081
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
- #: g10/import.c:1111
++#: g10/import.c:1110
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “[1m%s[0m” imported\n"
+
- #: g10/import.c:1135
++#: g10/import.c:1134
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
+#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
+#, 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:1202
++#: g10/import.c:1201
+#, 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:1205
++#: g10/import.c:1204
+#, 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:1208
++#: g10/import.c:1207
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “[1m%s[0m” 1 new signature\n"
+
- #: g10/import.c:1211
++#: g10/import.c:1210
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “[1m%s[0m” %d new signatures\n"
+
- #: g10/import.c:1214
++#: g10/import.c:1213
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “[1m%s[0m” 1 new subkey\n"
+
- #: g10/import.c:1217
++#: g10/import.c:1216
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “[1m%s[0m” %d new subkeys\n"
+
- #: g10/import.c:1220
++#: g10/import.c:1219
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signature cleaned\n"
+
- #: g10/import.c:1223
++#: g10/import.c:1222
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signatures cleaned\n"
+
- #: g10/import.c:1226
++#: g10/import.c:1225
+#, 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:1229
++#: g10/import.c:1228
+#, 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:1252
++#: g10/import.c:1251
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “[1m%s[0m” not changed\n"
+
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
- #: g10/import.c:1571
++#: g10/import.c:1570
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
- #: g10/import.c:1579
++#: g10/import.c:1578
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
- #: g10/import.c:1684
++#: g10/import.c:1683
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
- #: g10/import.c:1728
++#: g10/import.c:1727
+#, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "key %s: secret key with invalid cipher %d - skipped\n"
+
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card. A
+#. single smartcard can have up to three private key
+#. data. Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED. Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
+#, 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:1849
++#: g10/import.c:1848
+#, 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:1898
++#: g10/import.c:1897
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
- #: g10/import.c:1931
++#: g10/import.c:1930
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate imported\n"
+
- #: g10/import.c:2007
++#: g10/import.c:2006
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
- #: g10/import.c:2024
++#: g10/import.c:2023
+#, 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:2026
++#: g10/import.c:2025
+#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
- #: g10/import.c:2044
++#: g10/import.c:2043
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
- #: g10/import.c:2058
++#: g10/import.c:2057
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
- #: g10/import.c:2071
++#: g10/import.c:2070
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
- #: g10/import.c:2087
++#: g10/import.c:2086
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
- #: g10/import.c:2109
++#: g10/import.c:2108
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
- #: g10/import.c:2122
++#: g10/import.c:2121
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
- #: g10/import.c:2137
++#: g10/import.c:2136
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
- #: g10/import.c:2182
++#: g10/import.c:2181
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “[1m%s[0m”\n"
+
- #: g10/import.c:2205
++#: g10/import.c:2204
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
- #: g10/import.c:2234
++#: g10/import.c:2233
+#, 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:2245
++#: g10/import.c:2244
+#, 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:2263
++#: g10/import.c:2262
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
- #: g10/import.c:2277
++#: g10/import.c:2276
+#, 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:2285
++#: g10/import.c:2284
+#, 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:2414
++#: g10/import.c:2413
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
- #: g10/import.c:2478
++#: g10/import.c:2477
+#, 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:2494
++#: g10/import.c:2493
+#, 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:2558
++#: g10/import.c:2557
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate added\n"
+
- #: g10/import.c:2596
++#: g10/import.c:2595
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
+#, c-format
+msgid "error creating keybox '%s': %s\n"
+msgstr "error creating keybox '%s': %s\n"
+
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘[1m%s[0m’ created\n"
+
- #: g10/keydb.c:444
++#: g10/keydb.c:443
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘[1m%s[0m’ created\n"
+
- #: g10/keydb.c:823
++#: g10/keydb.c:822
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
- #: g10/keydb.c:908
++#: g10/keydb.c:907
+#, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error opening key DB: %s\n"
+
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
+msgid "[revocation]"
+msgstr "[revocation]"
+
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
+#, c-format
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d bad signature\n"
- msgstr[1] "%d bad signatures\n"
++msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
++msgstr ""
++"can't check signature with unsupported public-key algorithm (%d): %s.\n"
+
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
++#, c-format
++msgid ""
++"can't check signature with unsupported message-digest algorithm %d: %s.\n"
++msgstr ""
++"can't check signature with unsupported message-digest algorithm %d: %s.\n"
++
++#: g10/keyedit.c:782
++msgid " (reordered signatures follow)"
++msgstr " (reordered signatures follow)"
++
++#: g10/keyedit.c:895
++#, c-format
++msgid "key %s:\n"
++msgstr "key %s:\n"
++
++#: g10/keyedit.c:898
++#, c-format
++msgid "%d duplicate signature removed\n"
++msgid_plural "%d duplicate signatures removed\n"
++msgstr[0] "%d duplicate signature removed\n"
++msgstr[1] "%d duplicate signatures removed\n"
++
++#: g10/keyedit.c:901 g10/keylist.c:475
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d signature not checked due to a missing key\n"
+msgstr[1] "%d signatures not checked due to missing keys\n"
+
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
+#, c-format
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "%d signature not checked due to an error\n"
- msgstr[1] "%d signatures not checked due to errors\n"
++msgid "%d bad signature\n"
++msgid_plural "%d bad signatures\n"
++msgstr[0] "%d bad signature\n"
++msgstr[1] "%d bad signatures\n"
+
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
+#, c-format
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d user ID without valid self-signature detected\n"
- msgstr[1] "%d user IDs without valid self-signatures detected\n"
++msgid "%d signature reordered\n"
++msgid_plural "%d signatures reordered\n"
++msgstr[0] "%d signature reordered\n"
++msgstr[1] "%d signatures reordered\n"
+
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:914
++#, c-format
++msgid ""
++"Warning: errors found and only checked self-signatures, run '%s' to check "
++"all signatures.\n"
++msgstr ""
++"Warning: errors found and only checked self-signatures, run ‘[1m%s[0m’ to "
++"check all signatures.\n"
++
++#: g10/keyedit.c:974 g10/pkclist.c:275
+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:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
+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:501
++#: g10/keyedit.c:1014
+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:629
++#: g10/keyedit.c:1142
+#, 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:637
++#: g10/keyedit.c:1150
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “[1m%s[0m” is revoked."
+
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
+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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “[1m%s[0m” is expired."
+
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “[1m%s[0m” is not self-signed."
+
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “[1m%s[0m” is signable. "
+
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
+#, 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:760
++#: g10/keyedit.c:1273
+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:773
++#: g10/keyedit.c:1286
+#, 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:778
++#: g10/keyedit.c:1291
+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:799
++#: g10/keyedit.c:1312
+#, 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:804
++#: g10/keyedit.c:1317
+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:824
++#: g10/keyedit.c:1337
+#, 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:828
++#: g10/keyedit.c:1341
+#, 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:833
++#: g10/keyedit.c:1346
+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:855
++#: g10/keyedit.c:1368
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
+#, 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:903
++#: g10/keyedit.c:1416
+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:944
++#: g10/keyedit.c:1457
+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:949
++#: g10/keyedit.c:1462
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
+#, 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:953
++#: g10/keyedit.c:1466
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
+#, 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:963
++#: g10/keyedit.c:1476
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘[1m?[0m’ for more information): "
+
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
+#, 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:998
++#: g10/keyedit.c:1511
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
+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:1010
++#: g10/keyedit.c:1523
+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:1020
++#: g10/keyedit.c:1533
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
+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:1223
++#: g10/keyedit.c:1736
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
- #: g10/keyedit.c:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "moving a key signature to the correct place\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
+msgid "save and quit"
+msgstr "save and quit"
+
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
+msgid "select user ID N"
+msgstr "select user ID N"
+
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
+msgid "select subkey N"
+msgstr "select subkey N"
+
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
+msgid "check signatures"
+msgstr "check signatures"
+
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
+msgid "add a user ID"
+msgstr "add a user ID"
+
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
+msgid "add a subkey"
+msgstr "add a subkey"
+
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
+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:1432
++#: g10/keyedit.c:1898
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
+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:1443
++#: g10/keyedit.c:1909
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
+msgid "enable key"
+msgstr "enable key"
+
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
+msgid "disable key"
+msgstr "disable key"
+
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
+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:1465
++#: g10/keyedit.c:1931
+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:1577
++#: g10/keyedit.c:2043
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
+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:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘[1m%s[0m’\n"
+
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
+#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘[1m%s[0m’ command.)\n"
+
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
+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:1911
++#: g10/keyedit.c:2377
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
+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:2031
++#: g10/keyedit.c:2497
+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:2069
++#: g10/keyedit.c:2535
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
+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:2099
++#: g10/keyedit.c:2565
+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:2101
++#: g10/keyedit.c:2567
+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:2150
++#: g10/keyedit.c:2625
+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:2195
++#: g10/keyedit.c:2670
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
+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:2204
++#: g10/keyedit.c:2679
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“[1m%s[0m” is not a fingerprint\n"
+
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“[1m%s[0m” is not the primary fingerprint\n"
+
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
++#, c-format
++msgid "Invalid user ID '%s': %s\n"
++msgstr "Invalid user ID '%s': %s\n"
++
++#: g10/keyedit.c:3099
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
+msgid "Digest: "
+msgstr "Digest: "
+
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
+msgid "Features: "
+msgstr "Features: "
+
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
+msgid "Notations: "
+msgstr "Notations: "
+
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
+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:3101
++#: g10/keyedit.c:3620
+#, 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:3125
++#: g10/keyedit.c:3644
+#, 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:3131
++#: g10/keyedit.c:3650
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
+msgid "card-no: "
+msgstr "card-no: "
+
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
+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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
+msgid "revoked"
+msgstr "revoked"
+
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
+msgid "expired"
+msgstr "expired"
+
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
+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:3505
++#: g10/keyedit.c:4024
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
+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:3565
++#: g10/keyedit.c:4084
+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:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
+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:3576
++#: g10/keyedit.c:4095
+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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
+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:3690
++#: g10/keyedit.c:4209
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
+#, c-format
+msgid "Deleted %d signature.\n"
+msgid_plural "Deleted %d signatures.\n"
+msgstr[0] "Deleted %d signature.\n"
+msgstr[1] "Deleted %d signatures.\n"
+
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
+msgid "invalid"
+msgstr "invalid"
+
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “[1m%s[0m” compacted: %s\n"
+
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
+#, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgid_plural "User ID \"%s\": %d signatures removed\n"
+msgstr[0] "User ID “[1m%s[0m”: %d signature removed\n"
+msgstr[1] "User ID “[1m%s[0m”: %d signatures removed\n"
+
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “[1m%s[0m”: already minimized\n"
+
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “[1m%s[0m”: already clean\n"
+
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
+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:3863
++#: g10/keyedit.c:4382
+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:3880
++#: g10/keyedit.c:4399
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
+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:3920
++#: g10/keyedit.c:4439
+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:3942
++#: g10/keyedit.c:4461
+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:3961
++#: g10/keyedit.c:4479
+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:3967
++#: g10/keyedit.c:4485
+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:4018
++#: g10/keyedit.c:4536
+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:4023
++#: g10/keyedit.c:4541
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
+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:4144
++#: g10/keyedit.c:4768
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
+#, 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:4265
++#: g10/keyedit.c:4889
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
+#, 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:4477
++#: g10/keyedit.c:5101
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
+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:4557
++#: g10/keyedit.c:5181
+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:4616
++#: g10/keyedit.c:5240
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “[1m%s[0m”\n"
+
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
+#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
+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:5178
++#: g10/keyedit.c:5802
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
+#, 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:5267
++#: g10/keyedit.c:5891
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “[1m%s[0m” is already revoked\n"
+
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
+#, 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:5509
++#: g10/keyedit.c:6133
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
+#, 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:273
++#: g10/keygen.c:284
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘[1m%s[0m’ duplicated\n"
+
- #: g10/keygen.c:280
++#: g10/keygen.c:291
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
- #: g10/keygen.c:282
++#: g10/keygen.c:293
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
- #: g10/keygen.c:284
++#: g10/keygen.c:295
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
- #: g10/keygen.c:425
++#: g10/keygen.c:436
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘[1m%s[0m’ in preference string\n"
+
- #: g10/keygen.c:904
++#: g10/keygen.c:915
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
- #: g10/keygen.c:950
++#: g10/keygen.c:961
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
+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:1636
++#: g10/keygen.c:1647
+msgid "Sign"
+msgstr "Sign"
+
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
+msgid "Certify"
+msgstr "Certify"
+
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
+msgid "Encrypt"
+msgstr "Encrypt"
+
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
+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:1663
++#: g10/keygen.c:1675
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 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:1838
++#: g10/keygen.c:1855
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 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:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
+#, 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:2061
++#: g10/keygen.c:2078
+#, 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:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
+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:2341
++#: g10/keygen.c:2354
+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:2364
++#: g10/keygen.c:2377
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
+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:2419
++#: g10/keygen.c:2432
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
+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:2502
++#: g10/keygen.c:2515
+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:2521
++#: g10/keygen.c:2534
+msgid "Real name: "
+msgstr "Real name: "
+
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
+#, 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:2535
++#: g10/keygen.c:2548
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
+msgid "Email address: "
+msgstr "Email address: "
+
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
+msgid "Comment: "
+msgstr "Comment: "
+
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
+#, 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:2611
++#: g10/keygen.c:2624
+#, 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:2616
++#: g10/keygen.c:2629
+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:2641
++#: g10/keygen.c:2654
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
+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:2652
++#: g10/keygen.c:2665
+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:2657
++#: g10/keygen.c:2670
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
- #: g10/keygen.c:2658
++#: g10/keygen.c:2671
+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:2677
++#: g10/keygen.c:2690
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
+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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
+#, 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:3475
++#: g10/keygen.c:3488
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “[1m%s[0m” already exists\n"
+
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
+#, 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:3793
++#: g10/keygen.c:3811
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
+#, c-format
+msgid "Note: backup of card key saved to '%s'\n"
+msgstr "Note: backup of card key saved to ‘[1m%s[0m’\n"
+
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘[1m%s[0m’\n"
+
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
- #: g10/keygen.c:4196
++#: g10/keygen.c:4222
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
+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:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
+#, 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:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
+#, 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:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
+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:4294
++#: g10/keygen.c:4320
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
+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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
+msgid "never "
+msgstr "never "
+
- #: g10/keylist.c:331
++#: g10/keylist.c:330
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
- #: g10/keylist.c:333
++#: g10/keylist.c:332
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
- #: g10/keylist.c:375
++#: g10/keylist.c:374
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
- #: g10/keylist.c:428
++#: g10/keylist.c:427
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
- #: g10/keylist.c:430
++#: g10/keylist.c:429
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
- #: g10/keylist.c:468
++#: g10/keylist.c:467
+#, c-format
+msgid "%d good signature\n"
+msgid_plural "%d good signatures\n"
+msgstr[0] "%d good signature\n"
+msgstr[1] "%d good signatures\n"
+
- #: g10/keylist.c:563
++#: g10/keylist.c:480
++#, c-format
++msgid "%d signature not checked due to an error\n"
++msgid_plural "%d signatures not checked due to errors\n"
++msgstr[0] "%d signature not checked due to an error\n"
++msgstr[1] "%d signatures not checked due to errors\n"
++
++#: g10/keylist.c:562
+#, c-format
+msgid "Warning: %lu key skipped due to its large size\n"
+msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
+msgstr[0] "Warning: %lu key skipped due to its large size\n"
+msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
+
- #: g10/keylist.c:585
++#: g10/keylist.c:584
+msgid "Keyring"
+msgstr "Keyring"
+
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “[1m%s[0m”: %s\n"
+
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
+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:1898
++#: g10/keylist.c:1919
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘[1m%s[0m’\n"
+
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
+#, c-format
+msgid "%lu keys cached so far (%lu signature)\n"
+msgid_plural "%lu keys cached so far (%lu signatures)\n"
+msgstr[0] "%lu keys cached so far (%lu signature)\n"
+msgstr[1] "%lu keys cached so far (%lu signatures)\n"
+
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
+#, c-format
+msgid "%lu key cached"
+msgid_plural "%lu keys cached"
+msgstr[0] "%lu key cached"
+msgstr[1] "%lu keys cached"
+
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
+#, c-format
+msgid " (%lu signature)\n"
+msgid_plural " (%lu signatures)\n"
+msgstr[0] " (%lu signature)\n"
+msgstr[1] " (%lu signatures)\n"
+
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring created\n"
+
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
+msgid "override proxy options set for dirmngr"
+msgstr "override proxy options set for dirmngr"
+
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
+msgid "include revoked keys in search results"
+msgstr "include revoked keys in search results"
+
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
+msgid "include subkeys when searching by key ID"
+msgstr "include subkeys when searching by key ID"
+
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
+msgid "override timeout options set for dirmngr"
+msgstr "override timeout options set for dirmngr"
+
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "automatically retrieve keys when verifying signatures"
+
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "honor the preferred keyserver URL set on the key"
+
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr "honor the PKA record set on a key when retrieving keys"
+
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
+msgid "disabled"
+msgstr "disabled"
+
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
+msgid "Enter number(s), N)ext, or Q)uit > "
+msgstr "Enter number(s), N)ext, or Q)uit > "
+
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
+#, c-format
+msgid "invalid keyserver protocol (us %d!=handler %d)\n"
+msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
+
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
+#, c-format
+msgid "\"%s\" not a key ID: skipping\n"
+msgstr "“[1m%s[0m” not a key ID: skipping\n"
+
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
+#, c-format
+msgid "refreshing %d key from %s\n"
+msgid_plural "refreshing %d keys from %s\n"
+msgstr[0] "refreshing %d key from %s\n"
+msgstr[1] "refreshing %d keys from %s\n"
+
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
+#, 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:1529
++#: g10/keyserver.c:1528
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “[1m%s[0m” not found on keyserver\n"
+
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘[1m%s[0m’\n"
+
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
+#, 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
++#: g10/mainproc.c:304
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
+#, 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:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “[1m%s[0m”\n"
+
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
+#, 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
++#: g10/mainproc.c:620 g10/mainproc.c:634
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "Note: sender requested “[1mfor-your-eyes-only[0m”\n"
+
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "standalone revocation - use “[1mgpg --import[0m” to apply\n"
+
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
+#, 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:1746
++#: g10/mainproc.c:1745
+msgid "Key available at: "
+msgstr "Key available at: "
+
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “[1m%s[0m”"
+
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
+msgid "binary"
+msgstr "binary"
+
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
+msgid "textmode"
+msgstr "textmode"
+
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
+msgid "unknown"
+msgstr "unknown"
+
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
+#, 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:2144
++#: g10/mainproc.c:2143
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
+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:2294
++#: g10/mainproc.c:2293
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
+msgid "old style (PGP 2.x) signature\n"
+msgstr "old style (PGP 2.x) signature\n"
+
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
+#, c-format
+msgid "fstat of '%s' failed in %s: %s\n"
+msgstr "fstat of ‘[1m%s[0m’ failed in %s: %s\n"
+
- #: g10/misc.c:172
++#: g10/misc.c:170
+#, c-format
+msgid "fstat(%d) failed in %s: %s\n"
+msgstr "fstat(%d) failed in %s: %s\n"
+
- #: g10/misc.c:281
++#: g10/misc.c:279
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "WARNING: using experimental public key algorithm %s\n"
+
- #: g10/misc.c:288
++#: g10/misc.c:286
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+
- #: g10/misc.c:302
++#: g10/misc.c:300
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "WARNING: using experimental cipher algorithm %s\n"
+
- #: g10/misc.c:321
++#: g10/misc.c:319
+#, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "WARNING: using experimental digest algorithm %s\n"
+
- #: g10/misc.c:330
++#: g10/misc.c:328
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "WARNING: digest algorithm %s is deprecated\n"
+
- #: g10/misc.c:355
++#: g10/misc.c:353
+#, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "Note: signatures using the %s algorithm are rejected\n"
+
- #: g10/misc.c:377
++#: g10/misc.c:375
+#, c-format
+msgid "(reported error: %s)\n"
+msgstr "(reported error: %s)\n"
+
- #: g10/misc.c:380
++#: g10/misc.c:378
+#, c-format
+msgid "(reported error: %s <%s>)\n"
+msgstr "(reported error: %s <%s>)\n"
+
- #: g10/misc.c:399
++#: g10/misc.c:397
+msgid "(further info: "
+msgstr "(further info: "
+
- #: g10/misc.c:1058
++#: g10/misc.c:1056
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “[1m%s[0m”\n"
+
- #: g10/misc.c:1062
++#: g10/misc.c:1060
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “[1m%s[0m” is a deprecated option\n"
+
- #: g10/misc.c:1064
++#: g10/misc.c:1062
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “[1m%s%s[0m” instead\n"
+
- #: g10/misc.c:1071
++#: g10/misc.c:1069
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "WARNING: “[1m%s[0m” is a deprecated command - do not use it\n"
+
- #: g10/misc.c:1081
++#: g10/misc.c:1079
+#, c-format
+msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr ""
+"%s:%u: “[1m%s[0m” is obsolete in this file - it only has effect in %s\n"
+
- #: g10/misc.c:1085
++#: g10/misc.c:1083
+#, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+"WARNING: “[1m%s%s[0m” is an obsolete option - it has no effect except on %s\n"
+
- #: g10/misc.c:1149
++#: g10/misc.c:1147
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
- #: g10/misc.c:1294
++#: g10/misc.c:1292
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "this message may not be usable by %s\n"
+
- #: g10/misc.c:1469
++#: g10/misc.c:1467
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘[1m%s[0m’\n"
+
- #: g10/misc.c:1494
++#: g10/misc.c:1492
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘[1m%s[0m’\n"
+
- #: g10/misc.c:1732
++#: g10/misc.c:1730
+msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
+msgstr ""
+"ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
+
- #: g10/misc.c:1754
++#: g10/misc.c:1752
+#, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "unknown weak digest ‘[1m%s[0m’\n"
+
- #: g10/openfile.c:85
++#: g10/openfile.c:84
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘[1m%s[0m’ exists. "
+
- #: g10/openfile.c:89
++#: g10/openfile.c:88
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
- #: g10/openfile.c:124
++#: g10/openfile.c:123
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
- #: g10/openfile.c:148
++#: g10/openfile.c:147
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
- #: g10/openfile.c:219
++#: g10/openfile.c:218
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
- #: g10/openfile.c:367
++#: g10/openfile.c:366
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘[1m%s[0m’\n"
+
- #: g10/openfile.c:458
++#: g10/openfile.c:457
+#, c-format
+msgid "new configuration file '%s' created\n"
+msgstr "new configuration file ‘[1m%s[0m’ created\n"
+
- #: g10/openfile.c:499
++#: g10/openfile.c:498
+#, c-format
+msgid "WARNING: options in '%s' are not yet active during this run\n"
+msgstr "WARNING: options in ‘[1m%s[0m’ are not yet active during this run\n"
+
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "can't handle public key algorithm %d\n"
+
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
+#, 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
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
+#, 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
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
+#, c-format
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
+
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
+#, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for the OpenPGP "
+"certificate:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+msgstr ""
+"Please enter the passphrase to unlock the secret key for the OpenPGP "
+"certificate:\n"
+"“[1m%.*s[0m”\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for\n"
+"user: \"%s\"\n"
+msgstr ""
+"You need a passphrase to unlock the secret key for\n"
+"user: “[1m%s[0m”\n"
+
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
+#, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s key, ID %s, created %s"
+
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr " (subkey on main key ID %s)"
+
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
+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
++#: g10/passphrase.c:669
+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
++#: g10/passphrase.c:674
+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
++#: g10/passphrase.c:677
+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
++#: g10/passphrase.c:682
+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
++#: g10/passphrase.c:685
+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
++#: g10/passphrase.c:694
+#, 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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
+msgid "No reason specified"
+msgstr "No reason specified"
+
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
+msgid "User ID is no longer valid"
+msgstr "User ID is no longer valid"
+
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
+msgid "reason for revocation: "
+msgstr "reason for revocation: "
+
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
+msgid "revocation comment: "
+msgstr "revocation comment: "
+
+#. TRANSLATORS: These are the allowed answers in lower and
+#. uppercase. Below you will find the matching strings which
+#. should be translated accordingly and the letter changed to
+#. match the one in the answer string.
+#.
+#. i = please show me more information
+#. m = back to the main menu
+#. s = skip this key
+#. q = quit
+#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
+
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
+#, c-format
+msgid " aka \"%s\"\n"
+msgstr " aka “[1m%s[0m”\n"
+
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
+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:284
++#: g10/pkclist.c:283
+#, 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:286
++#: g10/pkclist.c:285
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = I do NOT trust\n"
+
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = I trust ultimately\n"
+
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
+msgid " m = back to the main menu\n"
+msgstr " m = back to the main menu\n"
+
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
+msgid " s = skip this key\n"
+msgstr " s = skip this key\n"
+
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
+msgid " q = quit\n"
+msgstr " q = quit\n"
+
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
+#, 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:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
+msgid "Your decision? "
+msgstr "Your decision? "
+
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
+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:347
++#: g10/pkclist.c:346
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certificates leading to an ultimately trusted key:\n"
+
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
+#, 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:441
++#: g10/pkclist.c:440
+#, 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:447
++#: g10/pkclist.c:446
+msgid "This key probably belongs to the named user\n"
+msgstr "This key probably belongs to the named user\n"
+
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
+msgid "This key belongs to us\n"
+msgstr "This key belongs to us\n"
+
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
+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:497
++#: g10/pkclist.c:496
+msgid "Use this key anyway? (y/N) "
+msgstr "Use this key anyway? (y/N) "
+
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
+msgid "WARNING: Using untrusted key!\n"
+msgstr "WARNING: Using untrusted key!\n"
+
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
+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:547
++#: g10/pkclist.c:562
+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:550
++#: g10/pkclist.c:565
+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:551
++#: g10/pkclist.c:566
+msgid " This could mean that the signature is forged.\n"
+msgstr " This could mean that the signature is forged.\n"
+
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
+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:562
++#: g10/pkclist.c:577
+msgid "Note: This key has been disabled.\n"
+msgstr "Note: This key has been disabled.\n"
+
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
+#, 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:589
++#: g10/pkclist.c:604
+#, 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:601
++#: g10/pkclist.c:616
+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:609
++#: g10/pkclist.c:624
+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:620
++#: g10/pkclist.c:635
+msgid "Note: This key has expired!\n"
+msgstr "Note: This key has expired!\n"
+
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
+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:633
++#: g10/pkclist.c:648
+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:641
++#: g10/pkclist.c:656
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
+
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
+msgid " The signature is probably a FORGERY.\n"
+msgstr " The signature is probably a FORGERY.\n"
+
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
+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:652
++#: g10/pkclist.c:667
+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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
+#, c-format
+msgid "can't encrypt to '%s'\n"
+msgstr "can't encrypt to ‘[1m%s[0m’\n"
+
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
+#, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "option ‘[1m%s[0m’ given, but no valid default keys given\n"
+
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
+#, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "option ‘[1m%s[0m’ given, but option ‘[1m%s[0m’ not given\n"
+
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
+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:1092
++#: g10/pkclist.c:1107
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
+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:1142
++#: g10/pkclist.c:1157
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “[1m%s[0m”\n"
+
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
+#, c-format
+msgid "Note: key %s has no %s feature\n"
+msgstr "Note: key %s has no %s feature\n"
+
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
+#, 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:85
++#: g10/plaintext.c:84
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "data not saved; use option “[1m--output[0m” to save it\n"
+
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
+msgid "Detached signature.\n"
+msgstr "Detached signature.\n"
+
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
+msgid "Please enter name of data file: "
+msgstr "Please enter name of data file: "
+
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
+msgid "reading stdin ...\n"
+msgstr "reading stdin ...\n"
+
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
+msgid "no signed data\n"
+msgstr "no signed data\n"
+
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
+#, c-format
+msgid "can't open signed data '%s'\n"
+msgstr "can't open signed data ‘[1m%s[0m’\n"
+
- #: g10/plaintext.c:735
++#: g10/plaintext.c:734
+#, 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
++#: g10/pubkey-enc.c:116
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "cipher algorithm %d%s is unknown or disabled\n"
+
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
+#, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
+
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
+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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
- #: g10/revoke.c:145
++#: g10/revoke.c:144
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
- #: g10/revoke.c:313
++#: g10/revoke.c:312
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
- #: g10/revoke.c:317
++#: g10/revoke.c:316
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
- #: g10/revoke.c:323
++#: g10/revoke.c:322
+msgid "Secret key is not available.\n"
+msgstr "Secret key is not available.\n"
+
- #: g10/revoke.c:328
++#: g10/revoke.c:327
+msgid "Create a designated revocation certificate for this key? (y/N) "
+msgstr "Create a designated revocation certificate for this key? (y/N) "
+
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
- #: g10/revoke.c:416
++#: g10/revoke.c:415
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
- #: g10/revoke.c:422
++#: g10/revoke.c:421
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “[1m%s[0m”\n"
+
- #: g10/revoke.c:552
++#: g10/revoke.c:551
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "This is a revocation certificate for the OpenPGP key:"
+
- #: g10/revoke.c:568
++#: g10/revoke.c:567
+msgid ""
+"A revocation certificate is a kind of \"kill switch\" to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+msgstr ""
+"A revocation certificate is a kind of “[1mkill switch[0m” to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+
- #: g10/revoke.c:571
++#: g10/revoke.c:570
+msgid ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command \"--gen-revoke\" in the GnuPG manual."
+msgstr ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command “[1m--gen-revoke[0m” in the GnuPG manual."
+
- #: g10/revoke.c:576
++#: g10/revoke.c:575
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+msgstr ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+
- #: g10/revoke.c:591
++#: g10/revoke.c:590
+#, c-format
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "revocation certificate stored as ‘[1m%s.rev[0m’\n"
+
- #: g10/revoke.c:635
++#: g10/revoke.c:634
+#, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "secret key “[1m%s[0m” not found\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line. Several lines
+#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr "‘[1m%s[0m’ matches multiple secret keys:\n"
+
- #: g10/revoke.c:689
++#: g10/revoke.c:688
+#, c-format
+msgid "error searching the keyring: %s\n"
+msgstr "error searching the keyring: %s\n"
+
- #: g10/revoke.c:712
++#: g10/revoke.c:711
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
- #: g10/revoke.c:736
++#: g10/revoke.c:735
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+
- #: g10/revoke.c:770
++#: g10/revoke.c:769
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
- #: g10/revoke.c:780
++#: g10/revoke.c:779
+msgid "Cancel"
+msgstr "Cancel"
+
- #: g10/revoke.c:782
++#: g10/revoke.c:781
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
- #: g10/revoke.c:823
++#: g10/revoke.c:822
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Enter an optional description; end it with an empty line:\n"
+
- #: g10/revoke.c:851
++#: g10/revoke.c:850
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
- #: g10/revoke.c:853
++#: g10/revoke.c:852
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
- #: g10/revoke.c:858
++#: g10/revoke.c:857
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
+msgid "weak key created - retrying\n"
+msgstr "weak key created - retrying\n"
+
- #: g10/seskey.c:65
++#: g10/seskey.c:66
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+
- #: g10/seskey.c:298
++#: g10/seskey.c:303
+#, 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
++#: g10/seskey.c:321
+#, 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:114
++#: g10/sig-check.c:116
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "WARNING: signing subkey %s is not cross-certified\n"
+
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
+#, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
+
- #: g10/sig-check.c:275
++#: g10/sig-check.c:277
+#, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgid_plural "public key %s is %lu seconds newer than the signature\n"
+msgstr[0] "public key %s is %lu second newer than the signature\n"
+msgstr[1] "public key %s is %lu seconds newer than the signature\n"
+
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
+#, c-format
+msgid "public key %s is %lu day newer than the signature\n"
+msgid_plural "public key %s is %lu days newer than the signature\n"
+msgstr[0] "public key %s is %lu day newer than the signature\n"
+msgstr[1] "public key %s is %lu days newer than the signature\n"
+
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr[0] ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr[1] ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
+#, c-format
+msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu days in the future (time warp or clock problem)\n"
+msgstr[0] ""
+"key %s was created %lu day in the future (time warp or clock problem)\n"
+msgstr[1] ""
+"key %s was created %lu days in the future (time warp or clock problem)\n"
+
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
+#, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "Note: signature key %s has been revoked\n"
+
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
+#, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
+
- #: g10/sig-check.c:801
++#: g10/sig-check.c:1043
+#, 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:836
++#: g10/sig-check.c:1046
+#, 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
++#: g10/sign.c:88
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+
- #: g10/sign.c:115
++#: g10/sign.c:114
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+
- #: g10/sign.c:138
++#: g10/sign.c:137
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+
- #: g10/sign.c:301
++#: g10/sign.c:300
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “[1m%s[0m”\n"
+
- #: g10/sign.c:849
++#: 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:980
++#: g10/sign.c:979
+msgid "signing:"
+msgstr "signing:"
+
- #: g10/sign.c:1256
++#: g10/sign.c:1255
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
+msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
+
- #: g10/skclist.c:188
++#: g10/skclist.c:187
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “[1m%s[0m”: duplicated\n"
+
- #: g10/skclist.c:207
++#: g10/skclist.c:206
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
- #: g10/skclist.c:226
++#: g10/skclist.c:225
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
+msgstr ""
+"this is a PGP generated Elgamal key which is not secure for signatures!"
+
- #: g10/tdbdump.c:58 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "trust record %lu, type %d: write failed: %s\n"
+
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use “[1mgpg --import-ownertrust[0m” to restore them)\n"
+
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
+#, c-format
+msgid "error in '%s': %s\n"
+msgstr "error in '%s': %s\n"
+
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
+msgid "line too long"
+msgstr "line too long"
+
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
+msgid "colon missing"
+msgstr "colon missing"
+
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
+msgid "invalid fingerprint"
+msgstr "invalid fingerprint"
+
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
+msgid "ownertrust value missing"
+msgstr "ownertrust value missing"
+
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
+#, c-format
+msgid "error finding trust record in '%s': %s\n"
+msgstr "error finding trust record in '%s': %s\n"
+
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
+#, c-format
+msgid "read error in '%s': %s\n"
+msgstr "read error in '%s': %s\n"
+
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
+#, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "can't create lock for ‘[1m%s[0m’\n"
+
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "can't lock ‘[1m%s[0m’\n"
+
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
+#, 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:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
+#, 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
++#: g10/tdbio.c:351
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaction too large\n"
+
- #: 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
++#: g10/tdbio.c:675
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
++#, c-format
++msgid "can't access '%s': %s\n"
++msgstr "can't access '%s': %s\n"
++
++#: g10/tdbio.c:717
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
+msgid "Note: trustdb not writable\n"
+msgstr "Note: trustdb not writable\n"
+
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
+#, 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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "Error: The trustdb is corrupted.\n"
+
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "can't handle text lines longer than %d characters\n"
+
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "input line longer than %d characters\n"
+
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
+#, c-format
+msgid "error beginning transaction on TOFU database: %s\n"
+msgstr "error beginning transaction on TOFU database: %s\n"
+
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
+#, c-format
+msgid "error committing transaction on TOFU database: %s\n"
+msgstr "error committing transaction on TOFU database: %s\n"
+
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
+#, c-format
+msgid "error rolling back transaction on TOFU database: %s\n"
+msgstr "error rolling back transaction on TOFU database: %s\n"
+
- #: g10/tofu.c:451
++#: g10/tofu.c:512
+#, c-format
+msgid "unsupported TOFU database version: %s\n"
+msgstr "unsupported TOFU database version: %s\n"
+
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
+#, c-format
+msgid "error reading TOFU database: %s\n"
+msgstr "error reading TOFU database: %s\n"
+
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
+#, c-format
+msgid "error determining TOFU database's version: %s\n"
+msgstr "error determining TOFU database's version: %s\n"
+
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
+#, c-format
+msgid "error initializing TOFU database: %s\n"
+msgstr "error initializing TOFU database: %s\n"
+
- #: g10/tofu.c:700
++#: g10/tofu.c:761
+#, c-format
+msgid "error opening TOFU database '%s': %s\n"
+msgstr "error opening TOFU database '%s': %s\n"
+
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
+msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
+msgstr "Warning: Home directory contains both tofu.db and tofu.d.\n"
+
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
+msgid "Using split format for TOFU database\n"
+msgstr "Using split format for TOFU database\n"
+
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
+#, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "error updating TOFU database: %s\n"
+
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
+#, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "error setting TOFU binding's trust level to %s\n"
+
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
+#, c-format
+msgid "The binding %s is NOT known."
+msgstr "The binding %s is NOT known."
+
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
+#, c-format
+msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
++"The key with fingerprint %s raised a conflict with the binding %s. Since "
++"this binding's policy was 'auto', it was changed to 'ask'."
+msgstr ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
++"The key with fingerprint %s raised a conflict with the binding %s. Since "
++"this binding's policy was 'auto', it was changed to 'ask'."
+
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
+#, c-format
+msgid ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+msgstr ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
+msgid "Known user IDs associated with this key:\n"
+msgstr "Known user IDs associated with this key:\n"
+
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
+#, c-format
+msgid "The email address \"%s\" is associated with %d key:\n"
+msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+msgstr[0] "The email address “[1m%s[0m” is associated with %d key:\n"
+msgstr[1] "The email address “[1m%s[0m” is associated with %d keys:\n"
+
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
+#, c-format
+msgid "Statistics for keys with the email address \"%s\":\n"
+msgstr "Statistics for keys with the email address “[1m%s[0m”:\n"
+
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
+msgid "this key"
+msgstr "this key"
+
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
+#, c-format
+msgid "%ld message signed in the future."
+msgid_plural "%ld messages signed in the future."
+msgstr[0] "%ld message signed in the future."
+msgstr[1] "%ld messages signed in the future."
+
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
+#, c-format
+msgid "%ld message signed"
+msgid_plural "%ld messages signed"
+msgstr[0] "%ld message signed"
+msgstr[1] "%ld messages signed"
+
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
+#, c-format
+msgid " over the past %ld day."
+msgid_plural " over the past %ld days."
+msgstr[0] " over the past %ld day."
+msgstr[1] " over the past %ld days."
+
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
+#, c-format
+msgid " over the past %ld week."
+msgid_plural " over the past %ld weeks."
+msgstr[0] " over the past %ld week."
+msgstr[1] " over the past %ld weeks."
+
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
+#, c-format
+msgid " over the past %ld month."
+msgid_plural " over the past %ld months."
+msgstr[0] " over the past %ld month."
+msgstr[1] " over the past %ld months."
+
+#. TRANSLATORS: Please translate the text found in the source
+#. file below. We don't directly internationalize that text
+#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
+msgid "TOFU detected a binding conflict"
+msgstr "TOFU detected a binding conflict"
+
+#. TRANSLATORS: Two letters (normally the lower and upper case
+#. version of the hotkey) for each of the five choices. If
+#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
+msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
+msgstr "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
+
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
- #: g10/tofu.c:2252
++#. TRANSLATORS: The tilde ('~') is used here to indicate a
++#. * non-breakable space
++#: g10/tofu.c:2317
+#, c-format
- msgid "%d year"
- msgid_plural "%d years"
- msgstr[0] "%d year"
- msgstr[1] "%d years"
++msgid "%d~year"
++msgid_plural "%d~years"
++msgstr[0] "%d~year"
++msgstr[1] "%d~years"
+
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
+#, c-format
- msgid "%d month"
- msgid_plural "%d months"
- msgstr[0] "%d month"
- msgstr[1] "%d months"
++msgid "%d~month"
++msgid_plural "%d~months"
++msgstr[0] "%d~month"
++msgstr[1] "%d~months"
+
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
+#, c-format
- msgid "%d day"
- msgid_plural "%d days"
- msgstr[0] "%d day"
- msgstr[1] "%d days"
++msgid "%d~day"
++msgid_plural "%d~days"
++msgstr[0] "%d~day"
++msgstr[1] "%d~days"
+
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
+#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
- msgstr[0] "%d hour"
- msgstr[1] "%d hours"
++msgid "%d~hour"
++msgid_plural "%d~hours"
++msgstr[0] "%d~hour"
++msgstr[1] "%d~hours"
+
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
+#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
- msgstr[0] "%d minute"
- msgstr[1] "%d minutes"
++msgid "%d~minute"
++msgid_plural "%d~minutes"
++msgstr[0] "%d~minute"
++msgstr[1] "%d~minutes"
+
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
+#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
- msgstr[0] "%d second"
- msgstr[1] "%d seconds"
++msgid "%d~second"
++msgid_plural "%d~seconds"
++msgstr[0] "%d~second"
++msgstr[1] "%d~seconds"
+
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
+#, c-format
+msgid "Have never verified a message signed by key %s!\n"
+msgstr "Have never verified a message signed by key %s!\n"
+
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
+#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
- msgstr "Failed to collect signature statistics for “[1m%s[0m” (key %s)\n"
++msgid ""
++"Failed to collect signature statistics for \"%s\"\n"
++"(key %s)\n"
++msgstr ""
++"Failed to collect signature statistics for “[1m%s[0m”\n"
++"(key %s)\n"
+
- #: g10/tofu.c:2415
++#: g10/tofu.c:2499
+#, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr "Verified 0 messages signed by “[1m%s[0m” (key: %s, policy: %s)."
++msgid "Verified %ld messages signed by \"%s\"."
++msgstr "Verified %ld messages signed by “[1m%s[0m”."
+
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
+#, c-format
+msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
++"Verified %ld message signed by \"%s\"\n"
++"in the past %s."
+msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
++"Verified %ld messages signed by \"%s\"\n"
++"in the past %s."
+msgstr[0] ""
- "Verified %ld message signed by “[1m%s[0m” (key: %s, policy: %s) in the past "
- "%s."
++"Verified %ld message signed by “[1m%s[0m”\n"
++"in the past %s."
+msgstr[1] ""
- "Verified %ld messages signed by “[1m%s[0m” (key: %s, policy: %s) in the past "
- "%s."
++"Verified %ld messages signed by “[1m%s[0m”\n"
++"in the past %s."
+
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
+#, c-format
+msgid "The most recent message was verified %s ago."
+msgstr "The most recent message was verified %s ago."
+
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
+msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgstr "Warning: we've have yet to see a message signed by this key!\n"
+
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
+msgid "Warning: we've only seen a single message signed by this key!\n"
+msgstr "Warning: we've only seen a single message signed by this key!\n"
+
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
+#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
- msgstr[0] "TOFU: few signatures %d message %s"
- msgstr[1] "TOFU: few signatures %d messages %s"
++msgid ""
++"Warning: if you think you've seen more than %ld message signed by this key, "
++"then this key might be a forgery! Carefully examine the email address for "
++"small variations. If the key is suspect, then use\n"
++" %s\n"
++"to mark it as being bad.\n"
++msgid_plural ""
++"Warning: if you think you've seen more than %ld messages signed by this key, "
++"then this key might be a forgery! Carefully examine the email address for "
++"small variations. If the key is suspect, then use\n"
++" %s\n"
++"to mark it as being bad.\n"
++msgstr[0] ""
++"Warning: if you think you've seen more than %ld message signed by this key, "
++"then this key might be a forgery! Carefully examine the email address for "
++"small variations. If the key is suspect, then use\n"
++" %s\n"
++"to mark it as being bad.\n"
++msgstr[1] ""
++"Warning: if you think you've seen more than %ld messages signed by this key, "
++"then this key might be a forgery! Carefully examine the email address for "
++"small variations. If the key is suspect, then use\n"
++" %s\n"
++"to mark it as being bad.\n"
+
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "‘[1m%s[0m’ is not a valid long keyID\n"
+
- #: g10/trustdb.c:242
++#: g10/trustdb.c:241
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
+
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
+#, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "key %s occurs more than once in the trustdb\n"
+
- #: g10/trustdb.c:295
++#: g10/trustdb.c:294
+#, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "key %s: no public key for trusted key - skipped\n"
+
- #: g10/trustdb.c:305
++#: g10/trustdb.c:304
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
+
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "trust record %lu, req type %d: read failed: %s\n"
+
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "trust record %lu is not of requested type %d\n"
+
- #: g10/trustdb.c:422
++#: g10/trustdb.c:421
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr "You may try to re-create the trustdb using the commands:\n"
+
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
+msgid "If that does not work, please consult the manual\n"
+msgstr "If that does not work, please consult the manual\n"
+
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
+
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
+#, c-format
+msgid "using %s trust model\n"
+msgstr "using %s trust model\n"
+
+#: g10/trustdb.c:510
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
+#: g10/trustdb.c:525
+#, c-format
+msgid "no need for a trustdb check with '%s' trust model\n"
+msgstr "no need for a trustdb check with ‘[1m%s[0m’ trust model\n"
+
+#: g10/trustdb.c:541
+#, c-format
+msgid "no need for a trustdb update with '%s' trust model\n"
+msgstr "no need for a trustdb update with ‘[1m%s[0m’ trust model\n"
+
+#: g10/trustdb.c:965
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:970
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
+#: g10/trustdb.c:1850
+#, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%d key processed"
+msgstr[1] "%d keys processed"
+
+#: g10/trustdb.c:1853
+#, c-format
+msgid " (%d validity count cleared)\n"
+msgid_plural " (%d validity counts cleared)\n"
+msgstr[0] " (%d validity count cleared)\n"
+msgstr[1] " (%d validity counts cleared)\n"
+
+#: g10/trustdb.c:1923
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
+#: g10/trustdb.c:1937
+#, 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:2051
++#: g10/trustdb.c:2054
+#, 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:2130
++#: g10/trustdb.c:2134
+#, 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
++#: g10/trust.c:105
+msgid "undefined"
+msgstr "undefined"
+
- #: g10/trust.c:107
++#: g10/trust.c:106
+msgid "never"
+msgstr "never"
+
- #: g10/trust.c:108
++#: g10/trust.c:107
+msgid "marginal"
+msgstr "marginal"
+
- #: g10/trust.c:109
++#: g10/trust.c:108
+msgid "full"
+msgstr "full"
+
- #: g10/trust.c:110
++#: g10/trust.c:109
+msgid "ultimate"
+msgstr "ultimate"
+
+#. TRANSLATORS: these strings are similar to those in
+#. trust_value_to_string(), but are a fixed length. This is needed to
+#. make attractive information listings where columns line up
+#. properly. The value "10" should be the length of the strings you
+#. choose to translate to. This is the length in printable columns.
+#. It gets passed to atoi() so everything after the number is
+#. essentially a comment and need not be translated. Either key and
+#. uid are both NULL, or neither are NULL.
- #: g10/trust.c:147
++#: g10/trust.c:146
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trust.c:uid_trust_string_fixed"
+
- #: g10/trust.c:150
++#: g10/trust.c:149
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
+msgid "[ expired]"
+msgstr "[ expired]"
+
- #: g10/trust.c:157
++#: g10/trust.c:156
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
- #: g10/trust.c:159
++#: g10/trust.c:158
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
- #: g10/trust.c:160
++#: g10/trust.c:159
+msgid "[marginal]"
+msgstr "[marginal]"
+
- #: g10/trust.c:161
++#: g10/trust.c:160
+msgid "[ full ]"
+msgstr "[ full ]"
+
- #: g10/trust.c:162
++#: g10/trust.c:161
+msgid "[ultimate]"
+msgstr "[ultimate]"
+
- #: g10/verify.c:118
++#: g10/verify.c:117
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+
- #: g10/verify.c:205
++#: g10/verify.c:204
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "input line %u too long or missing LF\n"
+
- #: g10/verify.c:254
++#: g10/verify.c:253
+#, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "can't open fd %d: %s\n"
+
+#: kbx/kbxutil.c:92
+msgid "set debugging flags"
+msgstr "set debugging flags"
+
+#: kbx/kbxutil.c:93
+msgid "enable full debugging"
+msgstr "enable full debugging"
+
+#: kbx/kbxutil.c:117
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Usage: kbxutil [options] [files] (-h for help)"
+
+#: kbx/kbxutil.c:120
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+msgstr ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+
+#: scd/app-nks.c:714 scd/app-openpgp.c:2995
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA modulus missing or not of size %d bits\n"
+
+#: scd/app-nks.c:722 scd/app-openpgp.c:3007
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA public exponent missing or larger than %d bits\n"
+
+#: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
+#: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
+#: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN callback returned error: %s\n"
+
+#: scd/app-nks.c:835
+msgid "the NullPIN has not yet been changed\n"
+msgstr "the NullPIN has not yet been changed\n"
+
+#: scd/app-nks.c:1096
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "|N|Please enter a new PIN for the standard keys."
+
+#: scd/app-nks.c:1097
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Please enter the PIN for the standard keys."
+
+#: scd/app-nks.c:1103
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+
+#: scd/app-nks.c:1105
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+
+#: scd/app-nks.c:1113
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
+
+#: scd/app-nks.c:1115
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Please enter the PIN for the key to create qualified signatures."
+
+#: scd/app-nks.c:1123
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+
+#: scd/app-nks.c:1125
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+
+#: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error getting new PIN: %s\n"
+
+#: scd/app-openpgp.c:805
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
+#: scd/app-openpgp.c:818
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "failed to store the creation date: %s\n"
+
+#: scd/app-openpgp.c:1286
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "reading public key failed: %s\n"
+
+#: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
+msgid "response does not contain the public key data\n"
+msgstr "response does not contain the public key data\n"
+
+#: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
+msgid "response does not contain the RSA public exponent\n"
+msgstr "response does not contain the RSA public exponent\n"
+
+#: scd/app-openpgp.c:1322
+msgid "response does not contain the EC public point\n"
+msgstr "response does not contain the EC public point\n"
+
+#: scd/app-openpgp.c:1708
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
+#: scd/app-openpgp.c:1715
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
+
+#: scd/app-openpgp.c:1730
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
+
+#: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN for CHV%d is too short; minimum length is %d\n"
+
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
+#: scd/app-openpgp.c:3937
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verify CHV%d failed: %s\n"
+
+#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: scd/app-openpgp.c:1877
+#, c-format
+msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgid_plural ""
+"%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string. Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1887
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+
+#: scd/app-openpgp.c:1891
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: scd/app-openpgp.c:1912
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: scd/app-openpgp.c:2265
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "Reset Code is too short; minimum length is %d\n"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:2298
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2299
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2299
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: scd/app-openpgp.c:2370
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||Please enter the Admin PIN and New Admin PIN"
+
+#: scd/app-openpgp.c:2371
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2443
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2447
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2449
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2451
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA prime %s missing or not of size %d bits\n"
+
+#: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: scd/app-openpgp.c:3320
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: scd/app-openpgp.c:3577
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: scd/app-openpgp.c:3590
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: scd/app-openpgp.c:3596
+#, c-format
+msgid "key generation completed (%d second)\n"
+msgid_plural "key generation completed (%d seconds)\n"
+msgstr[0] "key generation completed (%d second)\n"
+msgstr[1] "key generation completed (%d seconds)\n"
+
+#: scd/app-openpgp.c:3661
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: scd/app-openpgp.c:3711
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: scd/app-openpgp.c:3827
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: scd/app-openpgp.c:3912
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: scd/app-openpgp.c:4365
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"verification of Admin PIN is currently prohibited through this command\n"
+
+#: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "can't access %s - invalid OpenPGP card?\n"
+
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's pinpad"
+msgstr "||Please enter your PIN at the reader's pinpad"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-dinsig.c:529
+msgid "|N|Initial New PIN"
+msgstr "|N|Initial New PIN"
+
+#: scd/scdaemon.c:114
+msgid "run in multi server mode (foreground)"
+msgstr "run in multi server mode (foreground)"
+
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 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:655
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|write a log to FILE"
+
+#: scd/scdaemon.c:134
+msgid "|N|connect to reader at port N"
+msgstr "|N|connect to reader at port N"
+
+#: scd/scdaemon.c:136
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAME|use NAME as ct-API driver"
+
+#: scd/scdaemon.c:138
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAME|use NAME as PC/SC driver"
+
+#: scd/scdaemon.c:141
+msgid "do not use the internal CCID driver"
+msgstr "do not use the internal CCID driver"
+
+#: scd/scdaemon.c:147
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr "|N|disconnect the card after N seconds of inactivity"
+
+#: scd/scdaemon.c:150
+msgid "do not use a reader's pinpad"
+msgstr "do not use a reader's pinpad"
+
+#: scd/scdaemon.c:155
+msgid "deny the use of admin card commands"
+msgstr "deny the use of admin card commands"
+
+#: scd/scdaemon.c:158
+msgid "use variable length input for pinpad"
+msgstr "use variable length input for pinpad"
+
+#: scd/scdaemon.c: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:1159 dirmngr/dirmngr.c:1999
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
+#: 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:261 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:527
+msgid "looking up issuer at external location\n"
+msgstr "looking up issuer at external location\n"
+
+#: sm/certchain.c:546
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr "number of issuers matching: %d\n"
+
+#: sm/certchain.c:590
+msgid "looking up issuer from the Dirmngr cache\n"
+msgstr "looking up issuer from the Dirmngr cache\n"
+
+#: sm/certchain.c:614
+#, c-format
+msgid "number of matching certificates: %d\n"
+msgstr "number of matching certificates: %d\n"
+
+#: sm/certchain.c:616
+#, c-format
+msgid "dirmngr cache-only key lookup failed: %s\n"
+msgstr "dirmngr cache-only key lookup failed: %s\n"
+
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
+msgid "failed to allocate keyDB handle\n"
+msgstr "failed to allocate keyDB handle\n"
+
+#: sm/certchain.c:981
+msgid "certificate has been revoked"
+msgstr "certificate has been revoked"
+
+#: sm/certchain.c:996
+msgid "the status of the certificate is unknown"
+msgstr "the status of the certificate is unknown"
+
+#: sm/certchain.c:1003
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr "please make sure that the “[1mdirmngr[0m” is properly installed\n"
+
+#: sm/certchain.c:1009
+#, c-format
+msgid "checking the CRL failed: %s"
+msgstr "checking the CRL failed: %s"
+
+#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "certificate with invalid validity: %s"
+
+#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
+msgid "certificate not yet valid"
+msgstr "certificate not yet valid"
+
+#: sm/certchain.c:1054 sm/certchain.c:1139
+msgid "root certificate not yet valid"
+msgstr "root certificate not yet valid"
+
+#: sm/certchain.c:1055 sm/certchain.c:1140
+msgid "intermediate certificate not yet valid"
+msgstr "intermediate certificate not yet valid"
+
+#: sm/certchain.c:1068 dirmngr/validate.c:502
+msgid "certificate has expired"
+msgstr "certificate has expired"
+
+#: sm/certchain.c:1069
+msgid "root certificate has expired"
+msgstr "root certificate has expired"
+
+#: sm/certchain.c:1070
+msgid "intermediate certificate has expired"
+msgstr "intermediate certificate has expired"
+
+#: sm/certchain.c:1112
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr "required certificate attributes missing: %s%s%s"
+
+#: sm/certchain.c:1121
+msgid "certificate with invalid validity"
+msgstr "certificate with invalid validity"
+
+#: sm/certchain.c:1158
+msgid "signature not created during lifetime of certificate"
+msgstr "signature not created during lifetime of certificate"
+
+#: sm/certchain.c:1160
+msgid "certificate not created during lifetime of issuer"
+msgstr "certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1161
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr "intermediate certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1165
+msgid " ( signature created at "
+msgstr " ( signature created at "
+
+#: sm/certchain.c:1166
+msgid " (certificate created at "
+msgstr " (certificate created at "
+
+#: sm/certchain.c:1169
+msgid " (certificate valid from "
+msgstr " (certificate valid from "
+
+#: sm/certchain.c:1170
+msgid " ( issuer valid from "
+msgstr " ( issuer valid from "
+
+#: sm/certchain.c:1200 dirmngr/validate.c:552
+#, c-format
+msgid "fingerprint=%s\n"
+msgstr "fingerprint=%s\n"
+
+#: sm/certchain.c:1209
+msgid "root certificate has now been marked as trusted\n"
+msgstr "root certificate has now been marked as trusted\n"
+
+#: sm/certchain.c:1222
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr "interactive marking as trusted not enabled in gpg-agent\n"
+
+#: sm/certchain.c:1228
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr "interactive marking as trusted disabled for this session\n"
+
+#: sm/certchain.c:1286
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr "WARNING: creation time of signature not known - assuming current time"
+
+#: sm/certchain.c:1350
+msgid "no issuer found in certificate"
+msgstr "no issuer found in certificate"
+
+#: sm/certchain.c:1428
+msgid "self-signed certificate has a BAD signature"
+msgstr "self-signed certificate has a BAD signature"
+
+#: sm/certchain.c:1497 dirmngr/validate.c:550
+msgid "root certificate is not marked trusted"
+msgstr "root certificate is not marked trusted"
+
+#: sm/certchain.c:1513
+#, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "checking the trust list failed: %s\n"
+
+#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
+msgid "certificate chain too long\n"
+msgstr "certificate chain too long\n"
+
+#: sm/certchain.c:1556 dirmngr/validate.c:617
+msgid "issuer certificate not found"
+msgstr "issuer certificate not found"
+
+#: sm/certchain.c:1589 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: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:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
+#, c-format
+msgid "error locking keybox: %s\n"
+msgstr "error locking keybox: %s\n"
+
+#: sm/delete.c:143
+#, c-format
+msgid "duplicated certificate '%s' deleted\n"
+msgstr "duplicated certificate ‘[1m%s[0m’ deleted\n"
+
+#: sm/delete.c:145
+#, c-format
+msgid "certificate '%s' deleted\n"
+msgstr "certificate ‘[1m%s[0m’ deleted\n"
+
+#: sm/delete.c:175
+#, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "deleting certificate “[1m%s[0m” failed: %s\n"
+
+#: sm/encrypt.c:328
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
+msgid "list external keys"
+msgstr "list external keys"
+
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
+msgid "import certificates"
+msgstr "import certificates"
+
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
+msgid "export certificates"
+msgstr "export certificates"
+
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|write a server mode log to FILE"
+
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
+msgid ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+msgstr ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
+#, c-format
+msgid "Note: won't be able to encrypt to '%s': %s\n"
+msgstr "Note: won't be able to encrypt to '%s': %s\n"
+
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘[1m%s[0m’\n"
+
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "%s:%u: no hostname given\n"
+
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: password given without user\n"
+
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘[1m%s[0m’\n"
+
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
+msgid "invalid command (there is no implicit command)\n"
+msgstr "invalid command (there is no implicit command)\n"
+
+#: sm/import.c:127
+#, c-format
+msgid "total number processed: %lu\n"
+msgstr "total number processed: %lu\n"
+
+#: sm/import.c:246
+msgid "error storing certificate\n"
+msgstr "error storing certificate\n"
+
+#: sm/import.c:254
+msgid "basic certificate checks failed - not imported\n"
+msgstr "basic certificate checks failed - not imported\n"
+
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
+#, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "error getting stored flags: %s\n"
+
+#: sm/import.c:526 sm/import.c:558
+#, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error importing certificate: %s\n"
+
+#: sm/import.c:746 tools/gpg-connect-agent.c:1434
+#, c-format
+msgid "error reading input: %s\n"
+msgstr "error reading input: %s\n"
+
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr "problem looking for existing certificate: %s\n"
+
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
+#, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error finding writable keyDB: %s\n"
+
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
+#, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error storing certificate: %s\n"
+
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "problem re-searching certificate: %s\n"
+
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
+#, c-format
+msgid "error storing flags: %s\n"
+msgstr "error storing flags: %s\n"
+
+#: sm/keylist.c:658
+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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
+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:384
++#: dirmngr/dirmngr-client.c:390
+#, 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:2207
+#, c-format
+msgid "error closing cache file: %s\n"
+msgstr "error closing cache file: %s\n"
+
+#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
+#, c-format
+msgid "failed to open cache dir file '%s': %s\n"
+msgstr "failed to open cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:421
+#, c-format
+msgid "error creating new cache dir file '%s': %s\n"
+msgstr "error creating new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:428
+#, c-format
+msgid "error writing new cache dir file '%s': %s\n"
+msgstr "error writing new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:435
+#, c-format
+msgid "error closing new cache dir file '%s': %s\n"
+msgstr "error closing new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:440
+#, c-format
+msgid "new cache dir file '%s' created\n"
+msgstr "new cache dir file ‘[1m%s[0m’ created\n"
+
+#: dirmngr/crlcache.c:445
+#, c-format
+msgid "failed to re-open cache dir file '%s': %s\n"
+msgstr "failed to re-open cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:473
+#, c-format
+msgid "first record of '%s' is not the version\n"
+msgstr "first record of ‘[1m%s[0m’ is not the version\n"
+
+#: dirmngr/crlcache.c:488
+msgid "old version of cache directory - cleaning up\n"
+msgstr "old version of cache directory - cleaning up\n"
+
+#: dirmngr/crlcache.c:504
+msgid "old version of cache directory - giving up\n"
+msgstr "old version of cache directory - giving up\n"
+
+#: dirmngr/crlcache.c:615
+#, c-format
+msgid "extra field detected in crl record of '%s' line %u\n"
+msgstr "extra field detected in crl record of ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:623
+#, c-format
+msgid "invalid line detected in '%s' line %u\n"
+msgstr "invalid line detected in ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:632
+#, c-format
+msgid "duplicate entry detected in '%s' line %u\n"
+msgstr "duplicate entry detected in ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:647
+#, c-format
+msgid "unsupported record type in '%s' line %u skipped\n"
+msgstr "unsupported record type in ‘[1m%s[0m’ line %u skipped\n"
+
+#: dirmngr/crlcache.c:673
+#, c-format
+msgid "invalid issuer hash in '%s' line %u\n"
+msgstr "invalid issuer hash in ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:679
+#, c-format
+msgid "no issuer DN in '%s' line %u\n"
+msgstr "no issuer DN in ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:686
+#, c-format
+msgid "invalid timestamp in '%s' line %u\n"
+msgstr "invalid timestamp in ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:692
+#, c-format
+msgid "WARNING: invalid cache file hash in '%s' line %u\n"
+msgstr "WARNING: invalid cache file hash in ‘[1m%s[0m’ line %u\n"
+
+#: dirmngr/crlcache.c:698
+msgid "detected errors in cache dir file\n"
+msgstr "detected errors in cache dir file\n"
+
+#: dirmngr/crlcache.c:699
+msgid "please check the reason and manually delete that file\n"
+msgstr "please check the reason and manually delete that file\n"
+
+#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
+#, c-format
+msgid "failed to create temporary cache dir file '%s': %s\n"
+msgstr "failed to create temporary cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:937
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "error closing '%s': %s\n"
+
+#: dirmngr/crlcache.c:949
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "error renaming ‘[1m%s[0m’ to '%s': %s\n"
+
+#: dirmngr/crlcache.c:1003
+#, c-format
+msgid "can't hash '%s': %s\n"
+msgstr "can't hash '%s': %s\n"
+
+#: dirmngr/crlcache.c:1011
+#, c-format
+msgid "error setting up MD5 hash context: %s\n"
+msgstr "error setting up MD5 hash context: %s\n"
+
+#: dirmngr/crlcache.c:1027
+#, c-format
+msgid "error hashing '%s': %s\n"
+msgstr "error hashing '%s': %s\n"
+
+#: dirmngr/crlcache.c:1055
+#, c-format
+msgid "invalid formatted checksum for '%s'\n"
+msgstr "invalid formatted checksum for ‘[1m%s[0m’\n"
+
+#: dirmngr/crlcache.c:1108
+msgid "too many open cache files; can't open anymore\n"
+msgstr "too many open cache files; can't open anymore\n"
+
+#: dirmngr/crlcache.c:1126
+#, c-format
+msgid "opening cache file '%s'\n"
+msgstr "opening cache file ‘[1m%s[0m’\n"
+
+#: dirmngr/crlcache.c:1145
+#, c-format
+msgid "error opening cache file '%s': %s\n"
+msgstr "error opening cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:1154
+#, c-format
+msgid "error initializing cache file '%s' for reading: %s\n"
+msgstr "error initializing cache file ‘[1m%s[0m’ for reading: %s\n"
+
+#: dirmngr/crlcache.c:1175
+msgid "calling unlock_db_file on a closed file\n"
+msgstr "calling unlock_db_file on a closed file\n"
+
+#: dirmngr/crlcache.c:1177
+msgid "calling unlock_db_file on an unlocked file\n"
+msgstr "calling unlock_db_file on an unlocked file\n"
+
+#: dirmngr/crlcache.c:1231
+#, c-format
+msgid "failed to create a new cache object: %s\n"
+msgstr "failed to create a new cache object: %s\n"
+
+#: dirmngr/crlcache.c:1286
+#, c-format
+msgid "no CRL available for issuer id %s\n"
+msgstr "no CRL available for issuer id %s\n"
+
+#: dirmngr/crlcache.c:1293
+#, c-format
+msgid "cached CRL for issuer id %s too old; update required\n"
+msgstr "cached CRL for issuer id %s too old; update required\n"
+
+#: dirmngr/crlcache.c:1307
+#, c-format
+msgid ""
+"force-crl-refresh active and %d minutes passed for issuer id %s; update "
+"required\n"
+msgstr ""
+"force-crl-refresh active and %d minutes passed for issuer id %s; update "
+"required\n"
+
+#: dirmngr/crlcache.c:1315
+#, c-format
+msgid "force-crl-refresh active for issuer id %s; update required\n"
+msgstr "force-crl-refresh active for issuer id %s; update required\n"
+
+#: dirmngr/crlcache.c:1324
+#, c-format
+msgid "available CRL for issuer ID %s can't be used\n"
+msgstr "available CRL for issuer ID %s can't be used\n"
+
+#: dirmngr/crlcache.c:1335
+#, c-format
+msgid "cached CRL for issuer id %s tampered; we need to update\n"
+msgstr "cached CRL for issuer id %s tampered; we need to update\n"
+
+#: dirmngr/crlcache.c:1347
+msgid "WARNING: invalid cache record length for S/N "
+msgstr "WARNING: invalid cache record length for S/N "
+
+#: dirmngr/crlcache.c:1357
+#, c-format
+msgid "problem reading cache record for S/N %s: %s\n"
+msgstr "problem reading cache record for S/N %s: %s\n"
+
+#: dirmngr/crlcache.c:1360
+#, c-format
+msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
+msgstr "S/N %s is not valid; reason=%02X date=%.15s\n"
+
+#: dirmngr/crlcache.c:1371
+#, c-format
+msgid "S/N %s is valid, it is not listed in the CRL\n"
+msgstr "S/N %s is valid, it is not listed in the CRL\n"
+
+#: dirmngr/crlcache.c:1379
+#, c-format
+msgid "error getting data from cache file: %s\n"
+msgstr "error getting data from cache file: %s\n"
+
+#: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "unknown hash algorithm ‘[1m%s[0m’\n"
+
+#: dirmngr/crlcache.c:1549
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "gcry_md_open for algorithm %d failed: %s\n"
+
+#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
+msgid "got an invalid S-expression from libksba\n"
+msgstr "got an invalid S-expression from libksba\n"
+
+#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
+#, c-format
+msgid "converting S-expression failed: %s\n"
+msgstr "converting S-expression failed: %s\n"
+
+#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
+#, c-format
+msgid "creating S-expression failed: %s\n"
+msgstr "creating S-expression failed: %s\n"
+
+#: dirmngr/crlcache.c:1699
+#, c-format
+msgid "ksba_crl_parse failed: %s\n"
+msgstr "ksba_crl_parse failed: %s\n"
+
+#: dirmngr/crlcache.c:1714
+#, c-format
+msgid "error getting update times of CRL: %s\n"
+msgstr "error getting update times of CRL: %s\n"
+
+#: dirmngr/crlcache.c:1721
+#, c-format
+msgid "update times of this CRL: this=%s next=%s\n"
+msgstr "update times of this CRL: this=%s next=%s\n"
+
+#: dirmngr/crlcache.c:1725
+msgid "nextUpdate not given; assuming a validity period of one day\n"
+msgstr "nextUpdate not given; assuming a validity period of one day\n"
+
+#: dirmngr/crlcache.c:1745
+#, c-format
+msgid "error getting CRL item: %s\n"
+msgstr "error getting CRL item: %s\n"
+
+#: dirmngr/crlcache.c:1760
+#, c-format
+msgid "error inserting item into temporary cache file: %s\n"
+msgstr "error inserting item into temporary cache file: %s\n"
+
+#: dirmngr/crlcache.c:1787
+#, c-format
+msgid "no CRL issuer found in CRL: %s\n"
+msgstr "no CRL issuer found in CRL: %s\n"
+
+#: dirmngr/crlcache.c:1802
+msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
+msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
+
+#: dirmngr/crlcache.c:1847
+#, c-format
+msgid "CRL signature verification failed: %s\n"
+msgstr "CRL signature verification failed: %s\n"
+
+#: dirmngr/crlcache.c:1858
+#, c-format
+msgid "error checking validity of CRL issuer certificate: %s\n"
+msgstr "error checking validity of CRL issuer certificate: %s\n"
+
+#: dirmngr/crlcache.c:2001
+#, c-format
+msgid "ksba_crl_new failed: %s\n"
+msgstr "ksba_crl_new failed: %s\n"
+
+#: dirmngr/crlcache.c:2008
+#, c-format
+msgid "ksba_crl_set_reader failed: %s\n"
+msgstr "ksba_crl_set_reader failed: %s\n"
+
+#: dirmngr/crlcache.c:2042
+#, c-format
+msgid "removed stale temporary cache file '%s'\n"
+msgstr "removed stale temporary cache file ‘[1m%s[0m’\n"
+
+#: dirmngr/crlcache.c:2046
+#, c-format
+msgid "problem removing stale temporary cache file '%s': %s\n"
+msgstr "problem removing stale temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2056
+#, c-format
+msgid "error creating temporary cache file '%s': %s\n"
+msgstr "error creating temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2066
+#, c-format
+msgid "crl_parse_insert failed: %s\n"
+msgstr "crl_parse_insert failed: %s\n"
+
+#: dirmngr/crlcache.c:2076
+#, c-format
+msgid "error finishing temporary cache file '%s': %s\n"
+msgstr "error finishing temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2083
+#, c-format
+msgid "error closing temporary cache file '%s': %s\n"
+msgstr "error closing temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2108
+#, c-format
+msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
+msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
+
+#: dirmngr/crlcache.c:2112
+#, c-format
+msgid "new CRL still too old; it expired on %s\n"
+msgstr "new CRL still too old; it expired on %s\n"
+
+#: dirmngr/crlcache.c:2128
+#, c-format
+msgid "unknown critical CRL extension %s\n"
+msgstr "unknown critical CRL extension %s\n"
+
+#: dirmngr/crlcache.c:2138
+#, c-format
+msgid "error reading CRL extensions: %s\n"
+msgstr "error reading CRL extensions: %s\n"
+
+#: dirmngr/crlcache.c:2189
+#, c-format
+msgid "creating cache file '%s'\n"
+msgstr "creating cache file ‘[1m%s[0m’\n"
+
+#: dirmngr/crlcache.c:2221
+#, c-format
+msgid "problem renaming '%s' to '%s': %s\n"
+msgstr "problem renaming ‘[1m%s[0m’ to '%s': %s\n"
+
+#: dirmngr/crlcache.c:2235
+msgid ""
+"updating the DIR file failed - cache entry will get lost with the next "
+"program start\n"
+msgstr ""
+"updating the DIR file failed - cache entry will get lost with the next "
+"program start\n"
+
+#: dirmngr/crlcache.c:2272
+#, c-format
+msgid "Begin CRL dump (retrieved via %s)\n"
+msgstr "Begin CRL dump (retrieved via %s)\n"
+
+#: dirmngr/crlcache.c:2295
+msgid ""
+" ERROR: The CRL will not be used because it was still too old after an "
+"update!\n"
+msgstr ""
+" ERROR: The CRL will not be used because it was still too old after an "
+"update!\n"
+
+#: dirmngr/crlcache.c:2298
+msgid ""
+" ERROR: The CRL will not be used due to an unknown critical extension!\n"
+msgstr ""
+" ERROR: The CRL will not be used due to an unknown critical extension!\n"
+
+#: dirmngr/crlcache.c:2301
+msgid " ERROR: The CRL will not be used\n"
+msgstr " ERROR: The CRL will not be used\n"
+
+#: dirmngr/crlcache.c:2308
+msgid " ERROR: This cached CRL may have been tampered with!\n"
+msgstr " ERROR: This cached CRL may have been tampered with!\n"
+
+#: dirmngr/crlcache.c:2326
+msgid " WARNING: invalid cache record length\n"
+msgstr " WARNING: invalid cache record length\n"
+
+#: dirmngr/crlcache.c:2333
+#, c-format
+msgid "problem reading cache record: %s\n"
+msgstr "problem reading cache record: %s\n"
+
+#: dirmngr/crlcache.c:2344
+#, c-format
+msgid "problem reading cache key: %s\n"
+msgstr "problem reading cache key: %s\n"
+
+#: dirmngr/crlcache.c:2375
+#, c-format
+msgid "error reading cache entry from db: %s\n"
+msgstr "error reading cache entry from db: %s\n"
+
+#: dirmngr/crlcache.c:2378
+msgid "End CRL dump\n"
+msgstr "End CRL dump\n"
+
+#: dirmngr/crlcache.c:2499
+#, c-format
+msgid "crl_fetch via DP failed: %s\n"
+msgstr "crl_fetch via DP failed: %s\n"
+
+#: dirmngr/crlcache.c:2510
+#, c-format
+msgid "crl_cache_insert via DP failed: %s\n"
+msgstr "crl_cache_insert via DP failed: %s\n"
+
+#: dirmngr/crlcache.c:2570
+#, c-format
+msgid "crl_cache_insert via issuer failed: %s\n"
+msgstr "crl_cache_insert via issuer failed: %s\n"
+
+#: dirmngr/crlfetch.c:74
+msgid "reader to file mapping table full - waiting\n"
+msgstr "reader to file mapping table full - waiting\n"
+
+#: dirmngr/crlfetch.c:182
+msgid "using \"http\" instead of \"https\"\n"
+msgstr "using “[1mhttp[0m” instead of “[1mhttps[0m”\n"
+
+#: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
+#: dirmngr/crlfetch.c:359
+#, c-format
+msgid "CRL access not possible due to disabled %s\n"
+msgstr "CRL access not possible due to disabled %s\n"
+
+#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
+#: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
+#, c-format
+msgid "error initializing reader object: %s\n"
+msgstr "error initializing reader object: %s\n"
+
+#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL ‘[1m%s[0m’ redirected to ‘[1m%s[0m’ (%u)\n"
+
+#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
+msgid "too many redirections\n"
+msgstr "too many redirections\n"
+
+#: dirmngr/crlfetch.c:274
+#, c-format
+msgid "error retrieving '%s': %s\n"
+msgstr "error retrieving '%s': %s\n"
+
+#: dirmngr/crlfetch.c:279
+#, c-format
+msgid "error retrieving '%s': http status %u\n"
+msgstr "error retrieving '%s': http status %u\n"
+
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
+msgid "CRL access not possible due to Tor mode\n"
+msgstr "CRL access not possible due to Tor mode\n"
+
+#: dirmngr/crlfetch.c:386
+#, c-format
+msgid "certificate search not possible due to disabled %s\n"
+msgstr "certificate search not possible due to disabled %s\n"
+
+#: dirmngr/dirmngr-client.c:71
+msgid "use OCSP instead of CRLs"
+msgstr "use OCSP instead of CRLs"
+
+#: dirmngr/dirmngr-client.c:72
+msgid "check whether a dirmngr is running"
+msgstr "check whether a dirmngr is running"
+
+#: dirmngr/dirmngr-client.c:73
+msgid "add a certificate to the cache"
+msgstr "add a certificate to the cache"
+
+#: dirmngr/dirmngr-client.c:74
+msgid "validate a certificate"
+msgstr "validate a certificate"
+
+#: dirmngr/dirmngr-client.c:75
+msgid "lookup a certificate"
+msgstr "lookup a certificate"
+
+#: dirmngr/dirmngr-client.c:76
+msgid "lookup only locally stored certificates"
+msgstr "lookup only locally stored certificates"
+
+#: dirmngr/dirmngr-client.c:77
+msgid "expect an URL for --lookup"
+msgstr "expect an URL for --lookup"
+
+#: dirmngr/dirmngr-client.c:78
+msgid "load a CRL into the dirmngr"
+msgstr "load a CRL into the dirmngr"
+
+#: dirmngr/dirmngr-client.c:79
+msgid "special mode for use by Squid"
+msgstr "special mode for use by Squid"
+
+#: dirmngr/dirmngr-client.c:80
+msgid "expect certificates in PEM format"
+msgstr "expect certificates in PEM format"
+
+#: dirmngr/dirmngr-client.c:82
+msgid "force the use of the default OCSP responder"
+msgstr "force the use of the default OCSP responder"
+
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
+msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+
- #: dirmngr/dirmngr-client.c:154
++#: dirmngr/dirmngr-client.c:173
+msgid ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+msgstr ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
+#, c-format
+msgid "error reading certificate from stdin: %s\n"
+msgstr "error reading certificate from stdin: %s\n"
+
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
+#, c-format
+msgid "error reading certificate from '%s': %s\n"
+msgstr "error reading certificate from '%s': %s\n"
+
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
+msgid "certificate too large to make any sense\n"
+msgstr "certificate too large to make any sense\n"
+
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
+#, 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
++#: dirmngr/dirmngr-client.c:333
+#, c-format
+msgid "lookup failed: %s\n"
+msgstr "lookup failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
+#, c-format
+msgid "loading CRL '%s' failed: %s\n"
+msgstr "loading CRL ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
+msgid "a dirmngr daemon is up and running\n"
+msgstr "a dirmngr daemon is up and running\n"
+
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
+#, c-format
+msgid "validation of certificate failed: %s\n"
+msgstr "validation of certificate failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
+msgid "certificate is valid\n"
+msgstr "certificate is valid\n"
+
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
+msgid "certificate has been revoked\n"
+msgstr "certificate has been revoked\n"
+
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
+#, c-format
+msgid "certificate check failed: %s\n"
+msgstr "certificate check failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
+#, c-format
+msgid "got status: '%s'\n"
+msgstr "got status: ‘[1m%s[0m’\n"
+
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
+#, c-format
+msgid "error writing base64 encoding: %s\n"
+msgstr "error writing base64 encoding: %s\n"
+
- #: dirmngr/dirmngr-client.c:685
++#: dirmngr/dirmngr-client.c:702
+#, c-format
+msgid "unsupported inquiry '%s'\n"
+msgstr "unsupported inquiry ‘[1m%s[0m’\n"
+
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
+msgid "absolute file name expected\n"
+msgstr "absolute file name expected\n"
+
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
+#, c-format
+msgid "looking up '%s'\n"
+msgstr "looking up ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr.c:159
+msgid "run as windows service (background)"
+msgstr "run as windows service (background)"
+
+#: dirmngr/dirmngr.c:161
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
+#: dirmngr/dirmngr.c:162
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
+#: dirmngr/dirmngr.c:163
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
+#: dirmngr/dirmngr.c:164
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
+#: dirmngr/dirmngr.c:165
+msgid "flush the cache"
+msgstr "flush the cache"
+
+#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
+#: dirmngr/dirmngr.c:181
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
+#: dirmngr/dirmngr.c:182
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
+#: dirmngr/dirmngr.c:183
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
+#: dirmngr/dirmngr.c:184
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
+#: dirmngr/dirmngr.c:185
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
+#: dirmngr/dirmngr.c:187
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
+#: dirmngr/dirmngr.c:189
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
+#: dirmngr/dirmngr.c:191
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
+#: dirmngr/dirmngr.c:194
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
+#: dirmngr/dirmngr.c:196
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
+#: 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:201
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
+#: 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: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:209
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
+#: dirmngr/dirmngr.c:211
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
+#: 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: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:224
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
+
+#: 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:353
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
+#: 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:435
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr "valid debug levels are: %s\n"
+
+#: 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:1124
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘[1m%s[0m’ failed: %s\n"
+
+#: 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:1646 dirmngr/dirmngr.c:1730
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
+#: 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: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:1804
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
+#: dirmngr/dirmngr.c:1831
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
+#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
+#: 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:1843 dirmngr/dirmngr.c:1930
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
+#: dirmngr/dirmngr.c:1851
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
+#: 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:502
+#, c-format
+msgid "malloc failed: %s\n"
+msgstr "malloc failed: %s\n"
+
+#: dirmngr/ldap.c:627
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘[1m%s[0m’\n"
+
+#: dirmngr/ldap.c:840
+msgid "ldap_search hit the size limit of the server\n"
+msgstr "ldap_search hit the size limit of the server\n"
+
+#: dirmngr/misc.c:170
+msgid "invalid canonical S-expression found\n"
+msgstr "invalid canonical S-expression found\n"
+
+#: dirmngr/misc.c:194 dirmngr/misc.c:228
+#, c-format
+msgid "gcry_md_open failed: %s\n"
+msgstr "gcry_md_open failed: %s\n"
+
+#: dirmngr/misc.c:199 dirmngr/misc.c:233
+#, c-format
+msgid "oops: ksba_cert_hash failed: %s\n"
+msgstr "oops: ksba_cert_hash failed: %s\n"
+
+#: dirmngr/misc.c:518
+msgid "bad URL encoding detected\n"
+msgstr "bad URL encoding detected\n"
+
+#: dirmngr/ocsp.c:80
+#, c-format
+msgid "error reading from responder: %s\n"
+msgstr "error reading from responder: %s\n"
+
+#: dirmngr/ocsp.c:98
+#, c-format
+msgid "response from server too large; limit is %d bytes\n"
+msgstr "response from server too large; limit is %d bytes\n"
+
+#: dirmngr/ocsp.c:139
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "OCSP request not possible due to Tor mode\n"
+
+#: dirmngr/ocsp.c:145
+msgid "OCSP request not possible due to disabled HTTP\n"
+msgstr "OCSP request not possible due to disabled HTTP\n"
+
+#: dirmngr/ocsp.c:152
+#, c-format
+msgid "error setting OCSP target: %s\n"
+msgstr "error setting OCSP target: %s\n"
+
+#: dirmngr/ocsp.c:170
+#, c-format
+msgid "error building OCSP request: %s\n"
+msgstr "error building OCSP request: %s\n"
+
+#: dirmngr/ocsp.c:181
+#, c-format
+msgid "error connecting to '%s': %s\n"
+msgstr "error connecting to '%s': %s\n"
+
+#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
+#, c-format
+msgid "error reading HTTP response for '%s': %s\n"
+msgstr "error reading HTTP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:240
+#, c-format
+msgid "error accessing '%s': http status %u\n"
+msgstr "error accessing '%s': http status %u\n"
+
+#: dirmngr/ocsp.c:265
+#, c-format
+msgid "error parsing OCSP response for '%s': %s\n"
+msgstr "error parsing OCSP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
+#, c-format
+msgid "OCSP responder at '%s' status: %s\n"
+msgstr "OCSP responder at ‘[1m%s[0m’ status: %s\n"
+
+#: dirmngr/ocsp.c:293
+#, c-format
+msgid "hashing the OCSP response for '%s' failed: %s\n"
+msgstr "hashing the OCSP response for ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/ocsp.c:328
+msgid "not signed by a default OCSP signer's certificate"
+msgstr "not signed by a default OCSP signer's certificate"
+
+#: dirmngr/ocsp.c:417
+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:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2438
++#: dirmngr/server.c:2437
+#, 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:2478
++#: dirmngr/server.c:2477
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
+#, 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:608 tools/gpgconf-comp.c:683
+#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
+#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
+#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
+#: tools/gpgconf-comp.c:528
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
+#: tools/gpgconf-comp.c:532
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:536
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:560
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
+#: tools/gpgconf-comp.c:563
+msgid "do not allow to bypass the passphrase policy"
+msgstr "do not allow to bypass the passphrase policy"
+
+#: tools/gpgconf-comp.c:567
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|set minimal required length for new passphrases to N"
+
+#: tools/gpgconf-comp.c:571
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|require at least N non-alpha characters for a new passphrase"
+
+#: tools/gpgconf-comp.c:575
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
+#: tools/gpgconf-comp.c:579
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
+#: tools/gpgconf-comp.c:583
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
+#: tools/gpgconf-comp.c:587
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
+
+#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: tools/gpgconf-comp.c:704
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: tools/gpgconf-comp.c:735
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
+#: tools/gpgconf-comp.c:738
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
+#: tools/gpgconf-comp.c:787
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
+#: tools/gpgconf-comp.c:790
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: tools/gpgconf-comp.c:820
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: tools/gpgconf-comp.c:869
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
+#: tools/gpgconf-comp.c:905
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
+#: tools/gpgconf-comp.c:915
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
+#: tools/gpgconf-comp.c:929
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
+#: tools/gpgconf-comp.c:940
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: tools/gpgconf-comp.c:945
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: tools/gpgconf-comp.c:974
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
+#: tools/gpgconf-comp.c:982
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: tools/gpgconf-comp.c:1063
+msgid "GPG for OpenPGP"
+msgstr "GPG for OpenPGP"
+
+#: tools/gpgconf-comp.c:1064
+msgid "GPG Agent"
+msgstr "GPG Agent"
+
+#: tools/gpgconf-comp.c:1065
+msgid "Smartcard Daemon"
+msgstr "Smartcard Daemon"
+
+#: tools/gpgconf-comp.c:1066
+msgid "GPG for S/MIME"
+msgstr "GPG for S/MIME"
+
+#: tools/gpgconf-comp.c:1067
+msgid "Key Acquirer"
+msgstr "Key Acquirer"
+
+#: tools/gpgconf-comp.c:1068
+msgid "PIN and Passphrase Entry"
+msgstr "PIN and Passphrase Entry"
+
+#: tools/gpgconf-comp.c:1182
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
+#: tools/gpgconf-comp.c:3240
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
+#: tools/gpgconf-comp.c:3391
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
+#: tools/gpgconf.c: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.po
index 2dfd89a,0000000..97f7282
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,10502 -1,0 +1,10584 @@@
+# English translations for GNU gnupg package.
+# Copyright (C) 2016 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU gnupg package.
+# Automatically generated, 2016.
+#
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+msgid ""
+msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.11\n"
++"Project-Id-Version: GNU gnupg 2.1.12\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
- "PO-Revision-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
++"PO-Revision-Date: 2016-05-04 15:58+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agent/call-pinentry.c:257
+#, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "failed to acquire the pinentry lock: %s\n"
+
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries. An underscore indicates that the next letter
+#. should be used as an accelerator. Double the underscore for
+#. a literal one. The actual to be translated text starts after
+#. the second vertical bar. Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
+#: agent/call-pinentry.c:447
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
+#: agent/call-pinentry.c:448
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
+#: agent/call-pinentry.c:449
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
+#: agent/call-pinentry.c:450
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
+#: agent/call-pinentry.c:451
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
+#: agent/call-pinentry.c:452
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
+#: agent/call-pinentry.c:453
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Do you really want to make your passphrase visible on the screen?"
+
+#: agent/call-pinentry.c:455
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
+#: agent/call-pinentry.c:456
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "|pinentry-tt|Hide passphrase"
+
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:736
+msgid "Quality:"
+msgstr "Quality:"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar. Please use an appropriate
+#. string to describe what this is about. The length of the
+#. tooltip is limited to about 900 characters. If you do not
+#. translate this entry, a default english text (see source)
+#. will be used.
+#: agent/call-pinentry.c:758
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
+#: agent/call-pinentry.c:868
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+
+#: agent/call-pinentry.c:871
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
+msgid "PIN:"
+msgstr "PIN:"
+
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
+#: agent/call-pinentry.c:938 agent/command-ssh.c:3237 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:959
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
+#: agent/call-pinentry.c:971
+msgid "Repeat:"
+msgstr "Repeat:"
+
+#: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
+msgid "PIN too long"
+msgstr "PIN too long"
+
+#: agent/call-pinentry.c:1002
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
+#: agent/call-pinentry.c:1010
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
+#: agent/call-pinentry.c:1015
+msgid "PIN too short"
+msgstr "PIN too short"
+
+#: agent/call-pinentry.c:1028
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
+#: agent/call-pinentry.c:1028
+msgid "Bad Passphrase"
+msgstr "Bad Passphrase"
+
+#: agent/command-ssh.c:651 agent/command-ssh.c:746
+#, c-format
+msgid "ssh keys greater than %d bits are not supported\n"
+msgstr "ssh keys greater than %d bits are not supported\n"
+
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
+#, c-format
+msgid "can't create '%s': %s\n"
+msgstr "can't create '%s': %s\n"
+
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1668
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
+#: agent/command-ssh.c:2535 agent/command-ssh.c:2553
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error getting serial number of card: %s\n"
+
+#: agent/command-ssh.c:2539
+#, c-format
+msgid "detected card with S/N: %s\n"
+msgstr "detected card with S/N: %s\n"
+
+#: agent/command-ssh.c:2544
+#, c-format
+msgid "no authentication key for ssh on card: %s\n"
+msgstr "no authentication key for ssh on card: %s\n"
+
+#: agent/command-ssh.c:2564
+#, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "no suitable card key found: %s\n"
+
+#: agent/command-ssh.c:2614
+#, c-format
+msgid "shadowing the key failed: %s\n"
+msgstr "shadowing the key failed: %s\n"
+
+#: agent/command-ssh.c:2629
+#, c-format
+msgid "error writing key: %s\n"
+msgstr "error writing key: %s\n"
+
+#: agent/command-ssh.c:2912
+#, c-format
+msgid ""
+"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
+"allow this?"
+msgstr ""
+"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
+"allow this?"
+
+#: agent/command-ssh.c:2919
+msgid "Allow"
+msgstr "Allow"
+
+#: agent/command-ssh.c:2919
+msgid "Deny"
+msgstr "Deny"
+
+#: agent/command-ssh.c:2928
+#, c-format
+msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
+msgstr "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
+
+#: agent/command-ssh.c:3167 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
+#: agent/command-ssh.c:3192
+#, c-format
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
+"%s%%0Awithin gpg-agent's key storage"
+msgstr ""
+"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
+"%s%%0Awithin gpg-agent's key storage"
+
+#: agent/command-ssh.c:3712
+#, 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
+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:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
+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:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 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:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
+msgid "verbose"
+msgstr "verbose"
+
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
+msgid "csh-style command output"
+msgstr "csh-style command output"
+
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|read options from FILE"
+
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 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:166
++#: agent/gpg-agent.c:167
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
+msgid "use a log file for the server"
+msgstr "use a log file for the server"
+
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “trusted”"
+
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
- msgstr "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
++msgid "disallow caller to override the pinentry"
++msgstr "disallow caller to override the pinentry"
+
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
+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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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:480
++#: agent/gpg-agent.c:482
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
+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:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
+#, c-format
+msgid "invalid debug-level '%s' given\n"
+msgstr "invalid debug-level ‘%s’ given\n"
+
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: dirmngr/dirmngr.c:908
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘%s’\n"
+
- #: agent/gpg-agent.c:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
+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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
+#, c-format
+msgid "listen() failed: %s\n"
+msgstr "listen() failed: %s\n"
+
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
+#, c-format
+msgid "directory '%s' created\n"
+msgstr "directory ‘%s’ created\n"
+
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
++#, c-format
++msgid "can't set permissions of '%s': %s\n"
++msgstr "can't set permissions of '%s': %s\n"
++
++#: agent/gpg-agent.c:1964
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
+#, c-format
+msgid "can't use '%s' as home directory\n"
+msgstr "can't use ‘%s’ as home directory\n"
+
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
+#, 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:2392
++#: agent/gpg-agent.c:2400
+#, 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:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
+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
++#: agent/protect-tool.c:157
+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
++#: agent/protect-tool.c:705
+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
++#: agent/protect-tool.c:710
+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
++#: agent/protect-tool.c:716
+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
++#: agent/protect-tool.c:721
+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
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
+msgid "cancelled\n"
+msgstr "cancelled\n"
+
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 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: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
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: 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
++#: agent/findkey.c:251
+#, 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
++#: agent/findkey.c:267
+#, 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
++#: agent/findkey.c:281 agent/findkey.c:288
+msgid "Change passphrase"
+msgstr "Change passphrase"
+
- #: agent/findkey.c:175
++#: agent/findkey.c:289
+msgid "I'll change it later"
+msgstr "I'll change it later"
+
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
+#, 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
++#: agent/findkey.c:1449 agent/findkey.c:1463
+msgid "Delete key"
+msgstr "Delete key"
+
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
+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
++#: agent/pksign.c:176 g10/seskey.c:290 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
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: 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
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#, 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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 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
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+#, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "waiting for process %d to terminate failed: %s\n"
++msgid "waiting for processes to terminate failed: %s\n"
++msgstr "waiting for processes to terminate failed: %s\n"
+
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
+#, 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
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
+#, c-format
+msgid "error running '%s': exit status %d\n"
+msgstr "error running '%s': exit status %d\n"
+
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
+#, c-format
+msgid "error running '%s': terminated\n"
+msgstr "error running '%s': terminated\n"
+
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
+#, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "error getting exit code of process %d: %s\n"
+
++#: common/exechelp-w32ce.c:760
++#, c-format
++msgid "waiting for process %d to terminate failed: %s\n"
++msgstr "waiting for process %d to terminate failed: %s\n"
++
+#: common/simple-pwquery.c: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
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
+msgid "canceled by user\n"
+msgstr "canceled by user\n"
+
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
+msgid "problem with the agent\n"
+msgstr "problem with the agent\n"
+
++#: common/simple-pwquery.c:697
++#, c-format
++msgid "problem with the agent (unexpected response \"%s\")\n"
++msgstr "problem with the agent (unexpected response “%s”)\n"
++
+#: common/sysutils.c:124
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "can't disable core dumps: %s\n"
+
+#: common/sysutils.c:219
+#, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "Warning: unsafe ownership on %s “%s”\n"
+
+#: common/sysutils.c:251
+#, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Warning: unsafe permissions on %s “%s”\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:45 common/yesno.c:82
+msgid "yes"
+msgstr "yes"
+
+#: common/yesno.c:46 common/yesno.c:87
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:48 common/yesno.c:84
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:49 common/yesno.c:88
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:86
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:89
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:123
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:125
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: common/yesno.c:126
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:127
+msgid "cC"
+msgstr "cC"
+
+#: common/miscellaneous.c:86
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr "out of core in secure memory while allocating %lu bytes"
+
+#: common/miscellaneous.c:89
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr "out of core while allocating %lu bytes"
+
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#, c-format
++msgid "error allocating enough memory: %s\n"
++msgstr "error allocating enough memory: %s\n"
++
++#: common/miscellaneous.c:143
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: obsolete option “%s” - it has no effect\n"
+
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "WARNING: “%s%s” is an obsolete option - it has no effect\n"
+
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr "unknown debug flag ‘%s’ ignored\n"
+
+#: common/asshelp.c:411
+#, c-format
+msgid "no running gpg-agent - starting '%s'\n"
+msgstr "no running gpg-agent - starting ‘%s’\n"
+
+#: common/asshelp.c:471
+#, 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:479
+msgid "connection to agent established\n"
+msgstr "connection to agent established\n"
+
+#: common/asshelp.c:519
+msgid "connection to agent is in restricted mode\n"
+msgstr "connection to agent is in restricted mode\n"
+
+#: common/asshelp.c:601
+#, c-format
+msgid "no running Dirmngr - starting '%s'\n"
+msgstr "no running Dirmngr - starting ‘%s’\n"
+
+#: common/asshelp.c:658
+#, 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:667
+msgid "connection to the dirmngr established\n"
+msgstr "connection to the dirmngr established\n"
+
+#. TRANSLATORS: Copy the prefix between the vertical bars
+#. verbatim. It will not be printed.
+#: common/audit.c:474
+msgid "|audit-log-result|Good"
+msgstr "|audit-log-result|Good"
+
+#: common/audit.c:477
+msgid "|audit-log-result|Bad"
+msgstr "|audit-log-result|Bad"
+
+#: common/audit.c:479
+msgid "|audit-log-result|Not supported"
+msgstr "|audit-log-result|Not supported"
+
+#: common/audit.c:481
+msgid "|audit-log-result|No certificate"
+msgstr "|audit-log-result|No certificate"
+
+#: common/audit.c:483
+msgid "|audit-log-result|Not enabled"
+msgstr "|audit-log-result|Not enabled"
+
+#: common/audit.c:485
+msgid "|audit-log-result|Error"
+msgstr "|audit-log-result|Error"
+
+#: common/audit.c:487
+msgid "|audit-log-result|Not used"
+msgstr "|audit-log-result|Not used"
+
+#: common/audit.c:489
+msgid "|audit-log-result|Okay"
+msgstr "|audit-log-result|Okay"
+
+#: common/audit.c:491
+msgid "|audit-log-result|Skipped"
+msgstr "|audit-log-result|Skipped"
+
+#: common/audit.c:493
+msgid "|audit-log-result|Some"
+msgstr "|audit-log-result|Some"
+
+#: common/audit.c:726
+msgid "Certificate chain available"
+msgstr "Certificate chain available"
+
+#: common/audit.c:733
+msgid "root certificate missing"
+msgstr "root certificate missing"
+
+#: common/audit.c:759
+msgid "Data encryption succeeded"
+msgstr "Data encryption succeeded"
+
+#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
+msgid "Data available"
+msgstr "Data available"
+
+#: common/audit.c:767
+msgid "Session key created"
+msgstr "Session key created"
+
+#: common/audit.c:772 common/audit.c:912 common/audit.c:919
+#, c-format
+msgid "algorithm: %s"
+msgstr "algorithm: %s"
+
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
+#: scd/app-openpgp.c:2885
+#, c-format
+msgid "unsupported algorithm: %s"
+msgstr "unsupported algorithm: %s"
+
+#: common/audit.c:778 common/audit.c:925
+msgid "seems to be not encrypted"
+msgstr "seems to be not encrypted"
+
+#: common/audit.c:784 common/audit.c:933
+msgid "Number of recipients"
+msgstr "Number of recipients"
+
+#: common/audit.c:792 common/audit.c:956
+#, c-format
+msgid "Recipient %d"
+msgstr "Recipient %d"
+
+#: common/audit.c:825
+msgid "Data signing succeeded"
+msgstr "Data signing succeeded"
+
+#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
+#, c-format
+msgid "data hash algorithm: %s"
+msgstr "data hash algorithm: %s"
+
+#: common/audit.c:862
+#, c-format
+msgid "Signer %d"
+msgstr "Signer %d"
+
+#: common/audit.c:866 common/audit.c:1065
+#, c-format
+msgid "attr hash algorithm: %s"
+msgstr "attr hash algorithm: %s"
+
+#: common/audit.c:901
+msgid "Data decryption succeeded"
+msgstr "Data decryption succeeded"
+
+#: common/audit.c:910
+msgid "Encryption algorithm supported"
+msgstr "Encryption algorithm supported"
+
+#: common/audit.c:993
+msgid "Data verification succeeded"
+msgstr "Data verification succeeded"
+
+#: common/audit.c:1002
+msgid "Signature available"
+msgstr "Signature available"
+
+#: common/audit.c:1024
+msgid "Parsing data succeeded"
+msgstr "Parsing data succeeded"
+
+#: common/audit.c:1036
+#, c-format
+msgid "bad data hash algorithm: %s"
+msgstr "bad data hash algorithm: %s"
+
+#: common/audit.c:1051
+#, c-format
+msgid "Signature %d"
+msgstr "Signature %d"
+
+#: common/audit.c:1079
+msgid "Certificate chain valid"
+msgstr "Certificate chain valid"
+
+#: common/audit.c:1090
+msgid "Root certificate trustworthy"
+msgstr "Root certificate trustworthy"
+
+#: common/audit.c:1111 sm/certchain.c:991
+msgid "no CRL found for certificate"
+msgstr "no CRL found for certificate"
+
+#: common/audit.c:1114 sm/certchain.c:1001
+msgid "the available CRL is too old"
+msgstr "the available CRL is too old"
+
+#: common/audit.c:1119
+msgid "CRL/OCSP check of certificates"
+msgstr "CRL/OCSP check of certificates"
+
+#: common/audit.c:1139
+msgid "Included certificates"
+msgstr "Included certificates"
+
+#: common/audit.c:1194
+msgid "No audit log entries."
+msgstr "No audit log entries."
+
+#: common/audit.c:1243
+msgid "Unknown operation"
+msgstr "Unknown operation"
+
+#: common/audit.c:1261
+msgid "Gpg-Agent usable"
+msgstr "Gpg-Agent usable"
+
+#: common/audit.c:1271
+msgid "Dirmngr usable"
+msgstr "Dirmngr usable"
+
+#: common/audit.c:1307
+#, c-format
+msgid "No help available for '%s'."
+msgstr "No help available for '%s'."
+
+#: common/helpfile.c:90
+msgid "ignoring garbage line"
+msgstr "ignoring garbage line"
+
+#: common/gettime.c: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 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 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
++#: common/utf8conv.c:123
+#, c-format
+msgid "conversion from '%s' to '%s' not available\n"
+msgstr "conversion from ‘%s’ to ‘%s’ not available\n"
+
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
+#, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "iconv_open failed: %s\n"
+
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
+#, c-format
+msgid "conversion from '%s' to '%s' failed: %s\n"
+msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
+
+#: common/dotlock.c:707
+#, c-format
+msgid "failed to create temporary file '%s': %s\n"
+msgstr "failed to create temporary file '%s': %s\n"
+
+#: common/dotlock.c:771
+#, c-format
+msgid "error writing to '%s': %s\n"
+msgstr "error writing to '%s': %s\n"
+
+#: common/dotlock.c:1116
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr "removing stale lockfile (created by %d)\n"
+
+#: common/dotlock.c:1152
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "waiting for lock (held by %d%s) %s...\n"
+
+#: common/dotlock.c:1153
+msgid "(deadlock?) "
+msgstr "(deadlock?) "
+
+#: common/dotlock.c:1192
+#, c-format
+msgid "lock '%s' not made: %s\n"
+msgstr "lock ‘%s’ not made: %s\n"
+
+#: common/dotlock.c:1219
+#, c-format
+msgid "waiting for lock %s...\n"
+msgstr "waiting for lock %s...\n"
+
- #: g10/armor.c:377
++#: g10/armor.c:417
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
- #: g10/armor.c:416
++#: g10/armor.c:456
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
- #: g10/armor.c:427
++#: g10/armor.c:467
+msgid "armor header: "
+msgstr "armor header: "
+
- #: g10/armor.c:440
++#: g10/armor.c:480
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
- #: g10/armor.c:453
++#: g10/armor.c:493
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
- #: g10/armor.c:506
++#: g10/armor.c:546
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
- #: g10/armor.c:641
++#: g10/armor.c:681
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
- #: g10/armor.c:654
++#: g10/armor.c:694
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
- #: g10/armor.c:851
++#: g10/armor.c:909
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
- #: g10/armor.c:885
++#: g10/armor.c:943
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
- #: g10/armor.c:893
++#: g10/armor.c:951
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
- #: g10/armor.c:917
++#: g10/armor.c:975
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
- #: g10/armor.c:921
++#: g10/armor.c:979
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
- #: g10/armor.c:1238
++#: g10/armor.c:1296
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
- #: g10/armor.c:1243
++#: g10/armor.c:1301
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
- #: g10/armor.c:1247
++#: g10/armor.c:1305
+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
++#: g10/build-packet.c:1091
++#, c-format
++msgid "[ not human readable (%zu bytes: %s%s) ]"
++msgstr "[ not human readable (%zu bytes: %s%s) ]"
++
++#: g10/build-packet.c:1143
+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
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
+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
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
+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
++#: g10/build-packet.c:1179
+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
++#: g10/build-packet.c:1235
++msgid "a notation name may not contain an '=' character\n"
++msgstr "a notation name may not contain an ‘=’ character\n"
++
++#: g10/build-packet.c:1241
++msgid "a notation name must have only printable characters or spaces\n"
++msgstr "a notation name must have only printable characters or spaces\n"
++
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
+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:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
+#, c-format
+msgid "failed to proxy %s inquiry to client\n"
+msgstr "failed to proxy %s inquiry to client\n"
+
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
+#, c-format
+msgid "error getting version from '%s': %s\n"
+msgstr "error getting version from '%s': %s\n"
+
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
+#, c-format
+msgid "server '%s' is older than us (%s < %s)"
+msgstr "server ‘%s’ is older than us (%s < %s)"
+
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
+#, c-format
+msgid "WARNING: %s\n"
+msgstr "WARNING: %s\n"
+
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
+#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
+#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
+msgid "can't do this in batch mode\n"
+msgstr "can't do this in batch mode\n"
+
- #: g10/card-util.c:108
++#: g10/card-util.c:107
+msgid "This command is only available for version 2 cards\n"
+msgstr "This command is only available for version 2 cards\n"
+
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
+msgid "Reset Code not or not anymore available\n"
+msgstr "Reset Code not or not anymore available\n"
+
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
+msgid "Your selection? "
+msgstr "Your selection? "
+
+#: g10/card-util.c:279 g10/card-util.c:330
+msgid "[not set]"
+msgstr "[not set]"
+
+#: g10/card-util.c:533
+msgid "male"
+msgstr "male"
+
+#: g10/card-util.c:534
+msgid "female"
+msgstr "female"
+
+#: g10/card-util.c:534
+msgid "unspecified"
+msgstr "unspecified"
+
+#: g10/card-util.c:561
+msgid "not forced"
+msgstr "not forced"
+
+#: g10/card-util.c:561
+msgid "forced"
+msgstr "forced"
+
+#: g10/card-util.c:636
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
+#: g10/card-util.c:638
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “<” character may not be used.\n"
+
+#: g10/card-util.c:640
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
+#: g10/card-util.c:657
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
+#: g10/card-util.c:659
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
+#: g10/card-util.c:677
+#, c-format
+msgid "Error: Combined name too long (limit is %d characters).\n"
+msgstr "Error: Combined name too long (limit is %d characters).\n"
+
+#: g10/card-util.c:698
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
+#: g10/card-util.c:706
+#, c-format
+msgid "Error: URL too long (limit is %d characters).\n"
+msgstr "Error: URL too long (limit is %d characters).\n"
+
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
+#: g10/card-util.c:871
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
+#: g10/card-util.c:881
+#, 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:917
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
+#: g10/card-util.c:927
+#, 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:1010
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
+#: g10/card-util.c:1018
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
+#: g10/card-util.c:1027
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
+#: g10/card-util.c:1049
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
+#: g10/card-util.c:1063
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
+#: g10/card-util.c:1085
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
+#: g10/card-util.c:1108
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
+#: g10/card-util.c:1158
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
+#: g10/card-util.c:1159
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
+#: g10/card-util.c:1172
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
+#: g10/card-util.c:1259
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
+#: g10/card-util.c:1276
+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:1301
+#, 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:1303
+#, 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:1304
+#, 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:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: 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:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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:1328
+#, 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:1348
+#, 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:1372
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
+#: g10/card-util.c:1386
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
+#: g10/card-util.c:1389
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
+#: g10/card-util.c:1401
+#, 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:1458
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
+#: g10/card-util.c:1460 g10/card-util.c:1571
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
+#: g10/card-util.c:1461 g10/card-util.c:1573
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
+#: g10/card-util.c:1462 g10/card-util.c:1575
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
+#: g10/card-util.c:1568
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
+#: g10/card-util.c:1614
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
+#: g10/card-util.c:1710
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
+#: g10/card-util.c:1715
+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:1718
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
+#: g10/card-util.c:1723
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “yes”) "
+
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
+msgid "quit this menu"
+msgstr "quit this menu"
+
+#: g10/card-util.c:1811
+msgid "show admin commands"
+msgstr "show admin commands"
+
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
+msgid "show this help"
+msgstr "show this help"
+
+#: g10/card-util.c:1814
+msgid "list all available data"
+msgstr "list all available data"
+
+#: g10/card-util.c:1817
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
+#: g10/card-util.c:1818
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
+#: g10/card-util.c:1819
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
+#: g10/card-util.c:1820
+msgid "change the login name"
+msgstr "change the login name"
+
+#: g10/card-util.c:1821
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
+#: g10/card-util.c:1822
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
+#: g10/card-util.c:1823
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
+#: g10/card-util.c:1824
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
+#: g10/card-util.c:1825
+msgid "generate new keys"
+msgstr "generate new keys"
+
+#: g10/card-util.c:1826
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
+#: g10/card-util.c:1827
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
+#: g10/card-util.c:1828
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
+#: g10/card-util.c:1829
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
+#: g10/card-util.c:1951
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
+#: g10/card-util.c:1992
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
+#: g10/card-util.c:2023
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
+#: g10/card-util.c:2025
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “help”)\n"
+
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
+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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
+#, c-format
+msgid "can't open '%s'\n"
+msgstr "can't open ‘%s’\n"
+
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “%s” not found: %s\n"
+
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
+#, c-format
+msgid "key \"%s\" not found\n"
+msgstr "key “%s” not found\n"
+
- #: g10/delkey.c:130 g10/delkey.c:137
++#: g10/delkey.c:129 g10/delkey.c:136
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(unless you specify the key by fingerprint)\n"
+
- #: g10/delkey.c:136
++#: g10/delkey.c:135
+msgid "can't do this in batch mode without \"--yes\"\n"
+msgstr "can't do this in batch mode without “--yes”\n"
+
- #: g10/delkey.c:149
++#: g10/delkey.c:148
+msgid "Delete this key from the keyring? (y/N) "
+msgstr "Delete this key from the keyring? (y/N) "
+
- #: g10/delkey.c:159
++#: g10/delkey.c:158
+msgid "This is a secret key! - really delete? (y/N) "
+msgstr "This is a secret key! - really delete? (y/N) "
+
- #: g10/delkey.c:196
++#: g10/delkey.c:195
+#, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "deleting secret %s failed: %s\n"
+
- #: g10/delkey.c:198
++#: g10/delkey.c:197
+msgid "key"
+msgstr "key"
+
- #: g10/delkey.c:198
++#: g10/delkey.c:197
+msgid "subkey"
+msgstr "subkey"
+
- #: g10/delkey.c:221
++#: g10/delkey.c:220
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
- #: g10/delkey.c:234
++#: g10/delkey.c:233
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
- #: g10/delkey.c:270
++#: g10/delkey.c:269
+#, 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:272
++#: g10/delkey.c:271
+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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
+
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘%s’ already compressed\n"
+
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘%s’ is an empty file\n"
+
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘%s’\n"
+
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
+#, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 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:811
++#: g10/encrypt.c:818
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, 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:910
++#: g10/encrypt.c:904
+#, 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
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
++#, c-format
++msgid "you may not use %s while in %s mode\n"
++msgstr "you may not use %s while in %s mode\n"
++
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
+#, 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
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
+msgid "problem handling encrypted packet\n"
+msgstr "problem handling encrypted packet\n"
+
+#: g10/exec.c:60
+msgid "no remote program execution supported\n"
+msgstr "no remote program execution supported\n"
+
+#: g10/exec.c:319
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"external program calls are disabled due to unsafe options file permissions\n"
+
+#: g10/exec.c:349
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr ""
+"this platform requires temporary files when calling external programs\n"
+
+#: g10/exec.c:427
+#, c-format
+msgid "unable to execute program '%s': %s\n"
+msgstr "unable to execute program '%s': %s\n"
+
+#: g10/exec.c:430
+#, c-format
+msgid "unable to execute shell '%s': %s\n"
+msgstr "unable to execute shell '%s': %s\n"
+
+#: g10/exec.c:521
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "system error while calling external program: %s\n"
+
+#: g10/exec.c:532 g10/exec.c:599
+msgid "unnatural exit of external program\n"
+msgstr "unnatural exit of external program\n"
+
+#: g10/exec.c:547
+msgid "unable to execute external program\n"
+msgstr "unable to execute external program\n"
+
+#: g10/exec.c:564
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "unable to read external program response: %s\n"
+
+#: g10/exec.c:610 g10/exec.c:617
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+
+#: g10/exec.c:622
+#, c-format
+msgid "WARNING: unable to remove temp directory '%s': %s\n"
+msgstr "WARNING: unable to remove temp directory '%s': %s\n"
+
- #: g10/export.c:79
++#: g10/export.c:78
+msgid "export signatures that are marked as local-only"
+msgstr "export signatures that are marked as local-only"
+
- #: g10/export.c:81
++#: g10/export.c:80
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "export attribute user IDs (generally photo IDs)"
+
- #: g10/export.c:83
++#: g10/export.c:82
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "export revocation keys marked as “sensitive”"
+
- #: g10/export.c:85
++#: g10/export.c:84
+msgid "remove unusable parts from key during export"
+msgstr "remove unusable parts from key during export"
+
- #: g10/export.c:87
++#: g10/export.c:86
+msgid "remove as much as possible from key during export"
+msgstr "remove as much as possible from key during export"
+
- #: g10/export.c:896
++#: g10/export.c:895
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:976
++#: g10/export.c:975
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
- #: g10/export.c:1054
++#: g10/export.c:1053
+#, 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:1241
++#: g10/export.c:1240
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
- #: g10/export.c:1352
++#: g10/export.c:1351
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error creating '%s': %s\n"
+
- #: g10/getkey.c:245
++#: g10/getkey.c:244
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
+#, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "(check argument of option '%s')\n"
+
- #: g10/getkey.c:504
++#: g10/getkey.c:503
+#, c-format
+msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
+msgstr "Warning: ‘%s’ should be a long key ID or a fingerprint\n"
+
- #: g10/getkey.c:534
++#: g10/getkey.c:533
+#, c-format
+msgid "error looking up: %s\n"
+msgstr "error looking up: %s\n"
+
- #: g10/getkey.c:624
++#: g10/getkey.c:623
+#, c-format
+msgid "Warning: %s appears in the keyring %d times\n"
+msgstr "Warning: %s appears in the keyring %d times\n"
+
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘%s’ via %s\n"
+
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘%s’ via %s: %s\n"
+
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “%s” not found: %s\n"
+
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
+#, c-format
+msgid "Warning: not using '%s' as default key: %s\n"
+msgstr "Warning: not using ‘%s’ as default key: %s\n"
+
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
+#, c-format
+msgid "using \"%s\" as default secret key for signing\n"
+msgstr "using “%s” as default secret key for signing\n"
+
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘%s’ ignored\n"
+
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
+#, 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:3296
++#: g10/getkey.c:3301
+#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
+msgid "make a signature"
+msgstr "make a signature"
+
+#: g10/gpg.c:407
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
+msgid "encrypt data"
+msgstr "encrypt data"
+
+#: g10/gpg.c:411
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
+msgid "list keys"
+msgstr "list keys"
+
+#: g10/gpg.c:419
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
+#: g10/gpg.c:420
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
+#: g10/gpg.c:426
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
+#: g10/gpg.c:428
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
+#: g10/gpg.c:430
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
+#: g10/gpg.c:431
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
+#: g10/gpg.c:435
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
+#: g10/gpg.c:437
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
+#: g10/gpg.c:439
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
+#: g10/gpg.c:440
+msgid "sign a key"
+msgstr "sign a key"
+
+#: g10/gpg.c:441
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
+#: g10/gpg.c:442
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
+#: g10/gpg.c:446
+msgid "export keys"
+msgstr "export keys"
+
+#: g10/gpg.c:447
+msgid "export keys to a key server"
+msgstr "export keys to a key server"
+
+#: g10/gpg.c:448
+msgid "import keys from a key server"
+msgstr "import keys from a key server"
+
+#: g10/gpg.c:450
+msgid "search for keys on a key server"
+msgstr "search for keys on a key server"
+
+#: g10/gpg.c:452
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
+#: g10/gpg.c:458
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
+#: g10/gpg.c:461
+msgid "print the card status"
+msgstr "print the card status"
+
+#: g10/gpg.c:462
+msgid "change data on a card"
+msgstr "change data on a card"
+
+#: g10/gpg.c:463
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
+#: g10/gpg.c:475
+msgid "update the trust database"
+msgstr "update the trust database"
+
+#: g10/gpg.c:484
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
+msgid "run in server mode"
+msgstr "run in server mode"
+
+#: g10/gpg.c:489
- 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)"
++msgid "|VALUE|set the TOFU policy for a key"
++msgstr "|VALUE|set the TOFU policy for a key"
+
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|use USER-ID to sign or decrypt"
+
+#: g10/gpg.c:515
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
+#: g10/gpg.c:521
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
+#: g10/gpg.c:551
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
+#: g10/gpg.c:596
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file] sign and encrypt for user Bob\n"
+" --clearsign [file] make a clear text signature\n"
+" --detach-sign [file] make a detached signature\n"
+" --list-keys [names] show keys\n"
+" --fingerprint [names] show fingerprints\n"
+msgstr ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file] sign and encrypt for user Bob\n"
+" --clearsign [file] make a clear text signature\n"
+" --detach-sign [file] make a detached signature\n"
+" --list-keys [names] show keys\n"
+" --fingerprint [names] show fingerprints\n"
+
- #: g10/gpg.c:985
++#: g10/gpg.c:988
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:988
++#: g10/gpg.c:991
+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:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
+#, c-format
+msgid "no = sign found in group definition '%s'\n"
+msgstr "no = sign found in group definition ‘%s’\n"
+
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
+
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
+#, c-format
+msgid "WARNING: unsafe ownership on configuration file '%s'\n"
+msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
+
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
+
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
+#, c-format
+msgid "WARNING: unsafe permissions on configuration file '%s'\n"
+msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
+
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
+#, 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:1534
++#: g10/gpg.c:1537
+#, 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:1537
++#: g10/gpg.c:1540
+#, 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:1543
++#: g10/gpg.c:1546
+#, 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:1546
++#: g10/gpg.c:1549
+#, 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:1549
++#: g10/gpg.c:1552
+#, 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:1756
++#: g10/gpg.c:1759
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘%s’\n"
+
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
+msgid "available TOFU policies:\n"
+msgstr "available TOFU policies:\n"
+
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "unknown TOFU policy ‘%s’\n"
+
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “help” to list choices)\n"
+
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
+#, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "unknown TOFU DB format ‘%s’\n"
+
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
+#, c-format
+msgid "Note: old default options file '%s' ignored\n"
+msgstr "Note: old default options file ‘%s’ ignored\n"
+
- #: g10/gpg.c:2182
++#: g10/gpg.c:2185
+#, 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:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
+#, c-format
+msgid "'%s' is not a valid signature expiration\n"
+msgstr "‘%s’ is not a valid signature expiration\n"
+
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘%s’\n"
+
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
+#, c-format
+msgid "'%s' is not a valid character set\n"
+msgstr "‘%s’ is not a valid character set\n"
+
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
+#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
+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:3515
++#: g10/gpg.c:3522
+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:3517
++#: g10/gpg.c:3524
+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:3520
++#: g10/gpg.c:3527
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3524
++#: g10/gpg.c:3531
+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:3531
++#: g10/gpg.c:3538
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
+#, 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:3631
++#: g10/gpg.c:3638
+#, 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:3636
++#: g10/gpg.c:3643
+#, 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:3729
++#: g10/gpg.c:3736
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
+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:3796
++#: g10/gpg.c:3803
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘%s’ failed: %s\n"
+
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [filename]"
+
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
+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:3842
++#: g10/gpg.c:3849
+#, 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:3863
++#: g10/gpg.c:3870
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [filename]"
+
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
+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:3902
++#: g10/gpg.c:3909
+#, 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:3926
++#: g10/gpg.c:3933
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
+msgid "--passwd <user-id>"
+msgstr "--passwd <user-id>"
+
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘%s’\n"
+
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error parsing key specification '%s': %s\n"
+
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
+#, 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:4596
++#: g10/gpg.c:4603
+msgid "[filename]"
+msgstr "[filename]"
+
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
+#: g10/gpgv.c:75
+msgid "|FILE|take the keys from the keyring FILE"
+msgstr "|FILE|take the keys from the keyring FILE"
+
+#: g10/gpgv.c:77
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
+msgid "|FD|write status info to this FD"
+msgstr "|FD|write status info to this FD"
+
+#: g10/gpgv.c:119
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
+#: 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:105
++#: 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:108
++#: 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:111
++#: 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:114
++#: g10/import.c:113
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
- #: g10/import.c:117
++#: g10/import.c:116
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
- #: g10/import.c:120
++#: g10/import.c:119
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
- #: g10/import.c:123
++#: 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:344
++#: g10/import.c:343
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
- #: g10/import.c:361
++#: g10/import.c:360
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
- #: g10/import.c:431
++#: g10/import.c:430
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
- #: g10/import.c:434
++#: g10/import.c:433
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
- #: g10/import.c:436
++#: g10/import.c:435
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
- #: g10/import.c:439
++#: g10/import.c:438
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
- #: g10/import.c:448
++#: g10/import.c:447
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
- #: g10/import.c:450
++#: g10/import.c:449
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
- #: g10/import.c:452
++#: g10/import.c:451
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
- #: g10/import.c:454
++#: g10/import.c:453
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 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
++#: g10/import.c:457 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
++#: g10/import.c:459 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
++#: g10/import.c:461 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
- #: g10/import.c:464
++#: g10/import.c:463
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
- #: g10/import.c:466
++#: g10/import.c:465
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
- #: g10/import.c:810
++#: g10/import.c:809
+#, 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:852
++#: g10/import.c:851
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “%s”: preference for cipher algorithm %s\n"
+
- #: g10/import.c:867
++#: g10/import.c:866
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “%s”: preference for digest algorithm %s\n"
+
- #: g10/import.c:879
++#: g10/import.c:878
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “%s”: preference for compression algorithm %s\n"
+
- #: g10/import.c:892
++#: g10/import.c:891
+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:894
++#: g10/import.c:893
+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:919
++#: g10/import.c:918
+#, 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:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
- #: g10/import.c:989
++#: g10/import.c:988
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
- #: g10/import.c:1020
++#: g10/import.c:1019
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
- #: g10/import.c:1036
++#: g10/import.c:1035
+#, 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:1046
++#: g10/import.c:1045
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
- #: g10/import.c:1048
++#: g10/import.c:1047
+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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
- #: g10/import.c:1067
++#: g10/import.c:1066
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
- #: g10/import.c:1082
++#: g10/import.c:1081
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:815
++#: g10/sign.c:1117
+#, c-format
+msgid "writing to '%s'\n"
+msgstr "writing to ‘%s’\n"
+
- #: g10/import.c:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
- #: g10/import.c:1111
++#: g10/import.c:1110
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “%s” imported\n"
+
- #: g10/import.c:1135
++#: g10/import.c:1134
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
+#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
+#, 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:1202
++#: g10/import.c:1201
+#, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “%s” 1 new user ID\n"
+
- #: g10/import.c:1205
++#: g10/import.c:1204
+#, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “%s” %d new user IDs\n"
+
- #: g10/import.c:1208
++#: g10/import.c:1207
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “%s” 1 new signature\n"
+
- #: g10/import.c:1211
++#: g10/import.c:1210
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “%s” %d new signatures\n"
+
- #: g10/import.c:1214
++#: g10/import.c:1213
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “%s” 1 new subkey\n"
+
- #: g10/import.c:1217
++#: g10/import.c:1216
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “%s” %d new subkeys\n"
+
- #: g10/import.c:1220
++#: g10/import.c:1219
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “%s” %d signature cleaned\n"
+
- #: g10/import.c:1223
++#: g10/import.c:1222
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “%s” %d signatures cleaned\n"
+
- #: g10/import.c:1226
++#: g10/import.c:1225
+#, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "key %s: “%s” %d user ID cleaned\n"
+
- #: g10/import.c:1229
++#: g10/import.c:1228
+#, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "key %s: “%s” %d user IDs cleaned\n"
+
- #: g10/import.c:1252
++#: g10/import.c:1251
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “%s” not changed\n"
+
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
- #: g10/import.c:1571
++#: g10/import.c:1570
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
- #: g10/import.c:1579
++#: g10/import.c:1578
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
- #: g10/import.c:1684
++#: g10/import.c:1683
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
- #: g10/import.c:1728
++#: g10/import.c:1727
+#, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "key %s: secret key with invalid cipher %d - skipped\n"
+
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card. A
+#. single smartcard can have up to three private key
+#. data. Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED. Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
+#, 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:1849
++#: g10/import.c:1848
+#, 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:1898
++#: g10/import.c:1897
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
- #: g10/import.c:1931
++#: g10/import.c:1930
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “%s” revocation certificate imported\n"
+
- #: g10/import.c:2007
++#: g10/import.c:2006
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
- #: g10/import.c:2024
++#: g10/import.c:2023
+#, 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:2026
++#: g10/import.c:2025
+#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
- #: g10/import.c:2044
++#: g10/import.c:2043
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
- #: g10/import.c:2058
++#: g10/import.c:2057
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
- #: g10/import.c:2071
++#: g10/import.c:2070
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
- #: g10/import.c:2087
++#: g10/import.c:2086
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
- #: g10/import.c:2109
++#: g10/import.c:2108
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
- #: g10/import.c:2122
++#: g10/import.c:2121
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
- #: g10/import.c:2137
++#: g10/import.c:2136
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
- #: g10/import.c:2182
++#: g10/import.c:2181
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “%s”\n"
+
- #: g10/import.c:2205
++#: g10/import.c:2204
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
- #: g10/import.c:2234
++#: g10/import.c:2233
+#, 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:2245
++#: g10/import.c:2244
+#, 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:2263
++#: g10/import.c:2262
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
- #: g10/import.c:2277
++#: g10/import.c:2276
+#, 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:2285
++#: g10/import.c:2284
+#, 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:2414
++#: g10/import.c:2413
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
- #: g10/import.c:2478
++#: g10/import.c:2477
+#, 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:2494
++#: g10/import.c:2493
+#, 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:2558
++#: g10/import.c:2557
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “%s” revocation certificate added\n"
+
- #: g10/import.c:2596
++#: g10/import.c:2595
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
+#, c-format
+msgid "error creating keybox '%s': %s\n"
+msgstr "error creating keybox '%s': %s\n"
+
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘%s’ created\n"
+
- #: g10/keydb.c:444
++#: g10/keydb.c:443
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘%s’ created\n"
+
- #: g10/keydb.c:823
++#: g10/keydb.c:822
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
- #: g10/keydb.c:908
++#: g10/keydb.c:907
+#, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error opening key DB: %s\n"
+
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
+msgid "[revocation]"
+msgstr "[revocation]"
+
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
+#, c-format
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d bad signature\n"
- msgstr[1] "%d bad signatures\n"
++msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
++msgstr ""
++"can't check signature with unsupported public-key algorithm (%d): %s.\n"
+
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
++#, c-format
++msgid ""
++"can't check signature with unsupported message-digest algorithm %d: %s.\n"
++msgstr ""
++"can't check signature with unsupported message-digest algorithm %d: %s.\n"
++
++#: g10/keyedit.c:782
++msgid " (reordered signatures follow)"
++msgstr " (reordered signatures follow)"
++
++#: g10/keyedit.c:895
++#, c-format
++msgid "key %s:\n"
++msgstr "key %s:\n"
++
++#: g10/keyedit.c:898
++#, c-format
++msgid "%d duplicate signature removed\n"
++msgid_plural "%d duplicate signatures removed\n"
++msgstr[0] "%d duplicate signature removed\n"
++msgstr[1] "%d duplicate signatures removed\n"
++
++#: g10/keyedit.c:901 g10/keylist.c:475
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d signature not checked due to a missing key\n"
+msgstr[1] "%d signatures not checked due to missing keys\n"
+
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
+#, c-format
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "%d signature not checked due to an error\n"
- msgstr[1] "%d signatures not checked due to errors\n"
++msgid "%d bad signature\n"
++msgid_plural "%d bad signatures\n"
++msgstr[0] "%d bad signature\n"
++msgstr[1] "%d bad signatures\n"
+
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
+#, c-format
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d user ID without valid self-signature detected\n"
- msgstr[1] "%d user IDs without valid self-signatures detected\n"
++msgid "%d signature reordered\n"
++msgid_plural "%d signatures reordered\n"
++msgstr[0] "%d signature reordered\n"
++msgstr[1] "%d signatures reordered\n"
+
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:914
++#, c-format
++msgid ""
++"Warning: errors found and only checked self-signatures, run '%s' to check "
++"all signatures.\n"
++msgstr ""
++"Warning: errors found and only checked self-signatures, run ‘%s’ to check "
++"all signatures.\n"
++
++#: g10/keyedit.c:974 g10/pkclist.c:275
+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:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
+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:501
++#: g10/keyedit.c:1014
+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:629
++#: g10/keyedit.c:1142
+#, 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:637
++#: g10/keyedit.c:1150
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “%s” is revoked."
+
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
+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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “%s” is expired."
+
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “%s” is not self-signed."
+
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “%s” is signable. "
+
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
+#, 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:760
++#: g10/keyedit.c:1273
+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:773
++#: g10/keyedit.c:1286
+#, 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:778
++#: g10/keyedit.c:1291
+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:799
++#: g10/keyedit.c:1312
+#, 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:804
++#: g10/keyedit.c:1317
+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:824
++#: g10/keyedit.c:1337
+#, 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:828
++#: g10/keyedit.c:1341
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“%s” was already signed by key %s\n"
+
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
+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:855
++#: g10/keyedit.c:1368
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
+#, 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:903
++#: g10/keyedit.c:1416
+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:944
++#: g10/keyedit.c:1457
+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:949
++#: g10/keyedit.c:1462
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
+#, 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:953
++#: g10/keyedit.c:1466
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
+#, 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:963
++#: g10/keyedit.c:1476
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘?’ for more information): "
+
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
+#, 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:998
++#: g10/keyedit.c:1511
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
+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:1010
++#: g10/keyedit.c:1523
+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:1020
++#: g10/keyedit.c:1533
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
+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:1223
++#: g10/keyedit.c:1736
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
- #: g10/keyedit.c:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "moving a key signature to the correct place\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
+msgid "save and quit"
+msgstr "save and quit"
+
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
+msgid "select user ID N"
+msgstr "select user ID N"
+
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
+msgid "select subkey N"
+msgstr "select subkey N"
+
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
+msgid "check signatures"
+msgstr "check signatures"
+
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
+msgid "add a user ID"
+msgstr "add a user ID"
+
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
+msgid "add a subkey"
+msgstr "add a subkey"
+
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
+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:1432
++#: g10/keyedit.c:1898
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
+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:1443
++#: g10/keyedit.c:1909
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
+msgid "enable key"
+msgstr "enable key"
+
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
+msgid "disable key"
+msgstr "disable key"
+
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
+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:1465
++#: g10/keyedit.c:1931
+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:1577
++#: g10/keyedit.c:2043
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
+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:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘%s’\n"
+
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
+#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘%s’ command.)\n"
+
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
+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:1911
++#: g10/keyedit.c:2377
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
+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:2031
++#: g10/keyedit.c:2497
+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:2069
++#: g10/keyedit.c:2535
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
+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:2099
++#: g10/keyedit.c:2565
+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:2101
++#: g10/keyedit.c:2567
+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:2150
++#: g10/keyedit.c:2625
+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:2195
++#: g10/keyedit.c:2670
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
+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:2204
++#: g10/keyedit.c:2679
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“%s” is not a fingerprint\n"
+
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“%s” is not the primary fingerprint\n"
+
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
++#, c-format
++msgid "Invalid user ID '%s': %s\n"
++msgstr "Invalid user ID '%s': %s\n"
++
++#: g10/keyedit.c:3099
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
+msgid "Digest: "
+msgstr "Digest: "
+
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
+msgid "Features: "
+msgstr "Features: "
+
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
+msgid "Notations: "
+msgstr "Notations: "
+
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
+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:3101
++#: g10/keyedit.c:3620
+#, 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:3125
++#: g10/keyedit.c:3644
+#, 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:3131
++#: g10/keyedit.c:3650
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
+msgid "card-no: "
+msgstr "card-no: "
+
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
+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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
+msgid "revoked"
+msgstr "revoked"
+
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
+msgid "expired"
+msgstr "expired"
+
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
+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:3505
++#: g10/keyedit.c:4024
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
+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:3565
++#: g10/keyedit.c:4084
+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:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
+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:3576
++#: g10/keyedit.c:4095
+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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
+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:3690
++#: g10/keyedit.c:4209
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
+#, c-format
+msgid "Deleted %d signature.\n"
+msgid_plural "Deleted %d signatures.\n"
+msgstr[0] "Deleted %d signature.\n"
+msgstr[1] "Deleted %d signatures.\n"
+
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
+msgid "invalid"
+msgstr "invalid"
+
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “%s” compacted: %s\n"
+
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
+#, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgid_plural "User ID \"%s\": %d signatures removed\n"
+msgstr[0] "User ID “%s”: %d signature removed\n"
+msgstr[1] "User ID “%s”: %d signatures removed\n"
+
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “%s”: already minimized\n"
+
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “%s”: already clean\n"
+
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
+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:3863
++#: g10/keyedit.c:4382
+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:3880
++#: g10/keyedit.c:4399
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
+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:3920
++#: g10/keyedit.c:4439
+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:3942
++#: g10/keyedit.c:4461
+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:3961
++#: g10/keyedit.c:4479
+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:3967
++#: g10/keyedit.c:4485
+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:4018
++#: g10/keyedit.c:4536
+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:4023
++#: g10/keyedit.c:4541
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
+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:4144
++#: g10/keyedit.c:4768
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
+#, 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:4265
++#: g10/keyedit.c:4889
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
+#, 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:4477
++#: g10/keyedit.c:5101
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
+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:4557
++#: g10/keyedit.c:5181
+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:4616
++#: g10/keyedit.c:5240
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “%s”\n"
+
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
+#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
+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:5178
++#: g10/keyedit.c:5802
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
+#, 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:5267
++#: g10/keyedit.c:5891
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “%s” is already revoked\n"
+
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
+#, 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:5509
++#: g10/keyedit.c:6133
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
+#, 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:273
++#: g10/keygen.c:284
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘%s’ duplicated\n"
+
- #: g10/keygen.c:280
++#: g10/keygen.c:291
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
- #: g10/keygen.c:282
++#: g10/keygen.c:293
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
- #: g10/keygen.c:284
++#: g10/keygen.c:295
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
- #: g10/keygen.c:425
++#: g10/keygen.c:436
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘%s’ in preference string\n"
+
- #: g10/keygen.c:904
++#: g10/keygen.c:915
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
- #: g10/keygen.c:950
++#: g10/keygen.c:961
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
+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:1636
++#: g10/keygen.c:1647
+msgid "Sign"
+msgstr "Sign"
+
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
+msgid "Certify"
+msgstr "Certify"
+
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
+msgid "Encrypt"
+msgstr "Encrypt"
+
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
+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:1663
++#: g10/keygen.c:1675
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 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:1838
++#: g10/keygen.c:1855
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 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:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
+#, 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:2061
++#: g10/keygen.c:2078
+#, 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:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
+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:2341
++#: g10/keygen.c:2354
+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:2364
++#: g10/keygen.c:2377
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
+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:2419
++#: g10/keygen.c:2432
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
+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:2502
++#: g10/keygen.c:2515
+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:2521
++#: g10/keygen.c:2534
+msgid "Real name: "
+msgstr "Real name: "
+
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
+#, 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:2535
++#: g10/keygen.c:2548
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
+msgid "Email address: "
+msgstr "Email address: "
+
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
+msgid "Comment: "
+msgstr "Comment: "
+
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
+#, c-format
+msgid "You are using the '%s' character set.\n"
+msgstr "You are using the ‘%s’ character set.\n"
+
- #: g10/keygen.c:2611
++#: g10/keygen.c:2624
+#, 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:2616
++#: g10/keygen.c:2629
+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:2641
++#: g10/keygen.c:2654
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
+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:2652
++#: g10/keygen.c:2665
+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:2657
++#: g10/keygen.c:2670
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
- #: g10/keygen.c:2658
++#: g10/keygen.c:2671
+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:2677
++#: g10/keygen.c:2690
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
+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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
+#, 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:3475
++#: g10/keygen.c:3488
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “%s” already exists\n"
+
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
+#, 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:3793
++#: g10/keygen.c:3811
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
+#, c-format
+msgid "Note: backup of card key saved to '%s'\n"
+msgstr "Note: backup of card key saved to ‘%s’\n"
+
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘%s’\n"
+
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
- #: g10/keygen.c:4196
++#: g10/keygen.c:4222
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
+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:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
+#, 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:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
+#, 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:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
+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:4294
++#: g10/keygen.c:4320
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
+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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
+msgid "never "
+msgstr "never "
+
- #: g10/keylist.c:331
++#: g10/keylist.c:330
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
- #: g10/keylist.c:333
++#: g10/keylist.c:332
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
- #: g10/keylist.c:375
++#: g10/keylist.c:374
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
- #: g10/keylist.c:428
++#: g10/keylist.c:427
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
- #: g10/keylist.c:430
++#: g10/keylist.c:429
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
- #: g10/keylist.c:468
++#: g10/keylist.c:467
+#, c-format
+msgid "%d good signature\n"
+msgid_plural "%d good signatures\n"
+msgstr[0] "%d good signature\n"
+msgstr[1] "%d good signatures\n"
+
- #: g10/keylist.c:563
++#: g10/keylist.c:480
++#, c-format
++msgid "%d signature not checked due to an error\n"
++msgid_plural "%d signatures not checked due to errors\n"
++msgstr[0] "%d signature not checked due to an error\n"
++msgstr[1] "%d signatures not checked due to errors\n"
++
++#: g10/keylist.c:562
+#, c-format
+msgid "Warning: %lu key skipped due to its large size\n"
+msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
+msgstr[0] "Warning: %lu key skipped due to its large size\n"
+msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
+
- #: g10/keylist.c:585
++#: g10/keylist.c:584
+msgid "Keyring"
+msgstr "Keyring"
+
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “%s”: %s\n"
+
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
+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:1898
++#: g10/keylist.c:1919
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘%s’\n"
+
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
+#, c-format
+msgid "%lu keys cached so far (%lu signature)\n"
+msgid_plural "%lu keys cached so far (%lu signatures)\n"
+msgstr[0] "%lu keys cached so far (%lu signature)\n"
+msgstr[1] "%lu keys cached so far (%lu signatures)\n"
+
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
+#, c-format
+msgid "%lu key cached"
+msgid_plural "%lu keys cached"
+msgstr[0] "%lu key cached"
+msgstr[1] "%lu keys cached"
+
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
+#, c-format
+msgid " (%lu signature)\n"
+msgid_plural " (%lu signatures)\n"
+msgstr[0] " (%lu signature)\n"
+msgstr[1] " (%lu signatures)\n"
+
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring created\n"
+
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
+msgid "override proxy options set for dirmngr"
+msgstr "override proxy options set for dirmngr"
+
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
+msgid "include revoked keys in search results"
+msgstr "include revoked keys in search results"
+
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
+msgid "include subkeys when searching by key ID"
+msgstr "include subkeys when searching by key ID"
+
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
+msgid "override timeout options set for dirmngr"
+msgstr "override timeout options set for dirmngr"
+
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "automatically retrieve keys when verifying signatures"
+
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "honor the preferred keyserver URL set on the key"
+
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr "honor the PKA record set on a key when retrieving keys"
+
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
+msgid "disabled"
+msgstr "disabled"
+
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
+msgid "Enter number(s), N)ext, or Q)uit > "
+msgstr "Enter number(s), N)ext, or Q)uit > "
+
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
+#, c-format
+msgid "invalid keyserver protocol (us %d!=handler %d)\n"
+msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
+
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
+#, c-format
+msgid "\"%s\" not a key ID: skipping\n"
+msgstr "“%s” not a key ID: skipping\n"
+
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
+#, c-format
+msgid "refreshing %d key from %s\n"
+msgid_plural "refreshing %d keys from %s\n"
+msgstr[0] "refreshing %d key from %s\n"
+msgstr[1] "refreshing %d keys from %s\n"
+
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
+#, 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:1529
++#: g10/keyserver.c:1528
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “%s” not found on keyserver\n"
+
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘%s’\n"
+
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
+#, 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
++#: g10/mainproc.c:304
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
+#, 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:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “%s”\n"
+
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
+#, 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
++#: g10/mainproc.c:620 g10/mainproc.c:634
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "Note: sender requested “for-your-eyes-only”\n"
+
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "standalone revocation - use “gpg --import” to apply\n"
+
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “%s”"
+
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “%s”"
+
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “%s”"
+
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
+#, 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:1746
++#: g10/mainproc.c:1745
+msgid "Key available at: "
+msgstr "Key available at: "
+
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “%s”"
+
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
+msgid "binary"
+msgstr "binary"
+
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
+msgid "textmode"
+msgstr "textmode"
+
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
+msgid "unknown"
+msgstr "unknown"
+
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
+#, 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:2144
++#: g10/mainproc.c:2143
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
+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:2294
++#: g10/mainproc.c:2293
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
+msgid "old style (PGP 2.x) signature\n"
+msgstr "old style (PGP 2.x) signature\n"
+
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
+#, c-format
+msgid "fstat of '%s' failed in %s: %s\n"
+msgstr "fstat of ‘%s’ failed in %s: %s\n"
+
- #: g10/misc.c:172
++#: g10/misc.c:170
+#, c-format
+msgid "fstat(%d) failed in %s: %s\n"
+msgstr "fstat(%d) failed in %s: %s\n"
+
- #: g10/misc.c:281
++#: g10/misc.c:279
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "WARNING: using experimental public key algorithm %s\n"
+
- #: g10/misc.c:288
++#: g10/misc.c:286
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+
- #: g10/misc.c:302
++#: g10/misc.c:300
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "WARNING: using experimental cipher algorithm %s\n"
+
- #: g10/misc.c:321
++#: g10/misc.c:319
+#, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "WARNING: using experimental digest algorithm %s\n"
+
- #: g10/misc.c:330
++#: g10/misc.c:328
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "WARNING: digest algorithm %s is deprecated\n"
+
- #: g10/misc.c:355
++#: g10/misc.c:353
+#, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "Note: signatures using the %s algorithm are rejected\n"
+
- #: g10/misc.c:377
++#: g10/misc.c:375
+#, c-format
+msgid "(reported error: %s)\n"
+msgstr "(reported error: %s)\n"
+
- #: g10/misc.c:380
++#: g10/misc.c:378
+#, c-format
+msgid "(reported error: %s <%s>)\n"
+msgstr "(reported error: %s <%s>)\n"
+
- #: g10/misc.c:399
++#: g10/misc.c:397
+msgid "(further info: "
+msgstr "(further info: "
+
- #: g10/misc.c:1058
++#: g10/misc.c:1056
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “%s”\n"
+
- #: g10/misc.c:1062
++#: g10/misc.c:1060
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “%s” is a deprecated option\n"
+
- #: g10/misc.c:1064
++#: g10/misc.c:1062
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “%s%s” instead\n"
+
- #: g10/misc.c:1071
++#: g10/misc.c:1069
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "WARNING: “%s” is a deprecated command - do not use it\n"
+
- #: g10/misc.c:1081
++#: g10/misc.c:1079
+#, c-format
+msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: “%s” is obsolete in this file - it only has effect in %s\n"
+
- #: g10/misc.c:1085
++#: g10/misc.c:1083
+#, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+"WARNING: “%s%s” is an obsolete option - it has no effect except on %s\n"
+
- #: g10/misc.c:1149
++#: g10/misc.c:1147
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
- #: g10/misc.c:1294
++#: g10/misc.c:1292
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "this message may not be usable by %s\n"
+
- #: g10/misc.c:1469
++#: g10/misc.c:1467
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘%s’\n"
+
- #: g10/misc.c:1494
++#: g10/misc.c:1492
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘%s’\n"
+
- #: g10/misc.c:1732
++#: g10/misc.c:1730
+msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
+msgstr ""
+"ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
+
- #: g10/misc.c:1754
++#: g10/misc.c:1752
+#, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "unknown weak digest ‘%s’\n"
+
- #: g10/openfile.c:85
++#: g10/openfile.c:84
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘%s’ exists. "
+
- #: g10/openfile.c:89
++#: g10/openfile.c:88
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
- #: g10/openfile.c:124
++#: g10/openfile.c:123
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
- #: g10/openfile.c:148
++#: g10/openfile.c:147
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
- #: g10/openfile.c:219
++#: g10/openfile.c:218
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
- #: g10/openfile.c:367
++#: g10/openfile.c:366
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘%s’\n"
+
- #: g10/openfile.c:458
++#: g10/openfile.c:457
+#, c-format
+msgid "new configuration file '%s' created\n"
+msgstr "new configuration file ‘%s’ created\n"
+
- #: g10/openfile.c:499
++#: g10/openfile.c:498
+#, c-format
+msgid "WARNING: options in '%s' are not yet active during this run\n"
+msgstr "WARNING: options in ‘%s’ are not yet active during this run\n"
+
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "can't handle public key algorithm %d\n"
+
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
+#, 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
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
+#, 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
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
+#, c-format
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
+
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
+#, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for the OpenPGP "
+"certificate:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+msgstr ""
+"Please enter the passphrase to unlock the secret key for the OpenPGP "
+"certificate:\n"
+"“%.*s”\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for\n"
+"user: \"%s\"\n"
+msgstr ""
+"You need a passphrase to unlock the secret key for\n"
+"user: “%s”\n"
+
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
+#, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s key, ID %s, created %s"
+
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr " (subkey on main key ID %s)"
+
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
+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
++#: g10/passphrase.c:669
+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
++#: g10/passphrase.c:674
+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
++#: g10/passphrase.c:677
+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
++#: g10/passphrase.c:682
+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
++#: g10/passphrase.c:685
+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
++#: g10/passphrase.c:694
+#, 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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
+msgid "No reason specified"
+msgstr "No reason specified"
+
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
+msgid "User ID is no longer valid"
+msgstr "User ID is no longer valid"
+
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
+msgid "reason for revocation: "
+msgstr "reason for revocation: "
+
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
+msgid "revocation comment: "
+msgstr "revocation comment: "
+
+#. TRANSLATORS: These are the allowed answers in lower and
+#. uppercase. Below you will find the matching strings which
+#. should be translated accordingly and the letter changed to
+#. match the one in the answer string.
+#.
+#. i = please show me more information
+#. m = back to the main menu
+#. s = skip this key
+#. q = quit
+#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
+
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
+#, c-format
+msgid " aka \"%s\"\n"
+msgstr " aka “%s”\n"
+
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
+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:284
++#: g10/pkclist.c:283
+#, 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:286
++#: g10/pkclist.c:285
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = I do NOT trust\n"
+
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = I trust ultimately\n"
+
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
+msgid " m = back to the main menu\n"
+msgstr " m = back to the main menu\n"
+
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
+msgid " s = skip this key\n"
+msgstr " s = skip this key\n"
+
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
+msgid " q = quit\n"
+msgstr " q = quit\n"
+
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
+#, 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:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
+msgid "Your decision? "
+msgstr "Your decision? "
+
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
+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:347
++#: g10/pkclist.c:346
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certificates leading to an ultimately trusted key:\n"
+
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
+#, 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:441
++#: g10/pkclist.c:440
+#, 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:447
++#: g10/pkclist.c:446
+msgid "This key probably belongs to the named user\n"
+msgstr "This key probably belongs to the named user\n"
+
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
+msgid "This key belongs to us\n"
+msgstr "This key belongs to us\n"
+
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
+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:497
++#: g10/pkclist.c:496
+msgid "Use this key anyway? (y/N) "
+msgstr "Use this key anyway? (y/N) "
+
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
+msgid "WARNING: Using untrusted key!\n"
+msgstr "WARNING: Using untrusted key!\n"
+
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
+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:547
++#: g10/pkclist.c:562
+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:550
++#: g10/pkclist.c:565
+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:551
++#: g10/pkclist.c:566
+msgid " This could mean that the signature is forged.\n"
+msgstr " This could mean that the signature is forged.\n"
+
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
+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:562
++#: g10/pkclist.c:577
+msgid "Note: This key has been disabled.\n"
+msgstr "Note: This key has been disabled.\n"
+
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
+#, c-format
+msgid "Note: Verified signer's address is '%s'\n"
+msgstr "Note: Verified signer's address is ‘%s’\n"
+
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
+#, 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:601
++#: g10/pkclist.c:616
+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:609
++#: g10/pkclist.c:624
+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:620
++#: g10/pkclist.c:635
+msgid "Note: This key has expired!\n"
+msgstr "Note: This key has expired!\n"
+
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
+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:633
++#: g10/pkclist.c:648
+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:641
++#: g10/pkclist.c:656
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
+
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
+msgid " The signature is probably a FORGERY.\n"
+msgstr " The signature is probably a FORGERY.\n"
+
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
+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:652
++#: g10/pkclist.c:667
+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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
+#, c-format
+msgid "can't encrypt to '%s'\n"
+msgstr "can't encrypt to ‘%s’\n"
+
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
+#, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "option ‘%s’ given, but no valid default keys given\n"
+
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
+#, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "option ‘%s’ given, but option ‘%s’ not given\n"
+
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
+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:1092
++#: g10/pkclist.c:1107
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
+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:1142
++#: g10/pkclist.c:1157
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “%s”\n"
+
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
+#, c-format
+msgid "Note: key %s has no %s feature\n"
+msgstr "Note: key %s has no %s feature\n"
+
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
+#, 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:85
++#: g10/plaintext.c:84
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "data not saved; use option “--output” to save it\n"
+
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
+msgid "Detached signature.\n"
+msgstr "Detached signature.\n"
+
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
+msgid "Please enter name of data file: "
+msgstr "Please enter name of data file: "
+
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
+msgid "reading stdin ...\n"
+msgstr "reading stdin ...\n"
+
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
+msgid "no signed data\n"
+msgstr "no signed data\n"
+
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
+#, c-format
+msgid "can't open signed data '%s'\n"
+msgstr "can't open signed data ‘%s’\n"
+
- #: g10/plaintext.c:735
++#: g10/plaintext.c:734
+#, 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
++#: g10/pubkey-enc.c:116
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "cipher algorithm %d%s is unknown or disabled\n"
+
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
+#, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
+
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
+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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
- #: g10/revoke.c:145
++#: g10/revoke.c:144
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
- #: g10/revoke.c:313
++#: g10/revoke.c:312
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
- #: g10/revoke.c:317
++#: g10/revoke.c:316
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
- #: g10/revoke.c:323
++#: g10/revoke.c:322
+msgid "Secret key is not available.\n"
+msgstr "Secret key is not available.\n"
+
- #: g10/revoke.c:328
++#: g10/revoke.c:327
+msgid "Create a designated revocation certificate for this key? (y/N) "
+msgstr "Create a designated revocation certificate for this key? (y/N) "
+
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
- #: g10/revoke.c:416
++#: g10/revoke.c:415
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
- #: g10/revoke.c:422
++#: g10/revoke.c:421
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “%s”\n"
+
- #: g10/revoke.c:552
++#: g10/revoke.c:551
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "This is a revocation certificate for the OpenPGP key:"
+
- #: g10/revoke.c:568
++#: g10/revoke.c:567
+msgid ""
+"A revocation certificate is a kind of \"kill switch\" to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+msgstr ""
+"A revocation certificate is a kind of “kill switch” to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+
- #: g10/revoke.c:571
++#: g10/revoke.c:570
+msgid ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command \"--gen-revoke\" in the GnuPG manual."
+msgstr ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command “--gen-revoke” in the GnuPG manual."
+
- #: g10/revoke.c:576
++#: g10/revoke.c:575
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+msgstr ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+
- #: g10/revoke.c:591
++#: g10/revoke.c:590
+#, c-format
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "revocation certificate stored as ‘%s.rev’\n"
+
- #: g10/revoke.c:635
++#: g10/revoke.c:634
+#, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "secret key “%s” not found\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line. Several lines
+#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr "‘%s’ matches multiple secret keys:\n"
+
- #: g10/revoke.c:689
++#: g10/revoke.c:688
+#, c-format
+msgid "error searching the keyring: %s\n"
+msgstr "error searching the keyring: %s\n"
+
- #: g10/revoke.c:712
++#: g10/revoke.c:711
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
- #: g10/revoke.c:736
++#: g10/revoke.c:735
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+
- #: g10/revoke.c:770
++#: g10/revoke.c:769
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
- #: g10/revoke.c:780
++#: g10/revoke.c:779
+msgid "Cancel"
+msgstr "Cancel"
+
- #: g10/revoke.c:782
++#: g10/revoke.c:781
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
- #: g10/revoke.c:823
++#: g10/revoke.c:822
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Enter an optional description; end it with an empty line:\n"
+
- #: g10/revoke.c:851
++#: g10/revoke.c:850
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
- #: g10/revoke.c:853
++#: g10/revoke.c:852
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
- #: g10/revoke.c:858
++#: g10/revoke.c:857
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
+msgid "weak key created - retrying\n"
+msgstr "weak key created - retrying\n"
+
- #: g10/seskey.c:65
++#: g10/seskey.c:66
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+
- #: g10/seskey.c:298
++#: g10/seskey.c:303
+#, 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
++#: g10/seskey.c:321
+#, 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:114
++#: g10/sig-check.c:116
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "WARNING: signing subkey %s is not cross-certified\n"
+
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
+#, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
+
- #: g10/sig-check.c:275
++#: g10/sig-check.c:277
+#, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgid_plural "public key %s is %lu seconds newer than the signature\n"
+msgstr[0] "public key %s is %lu second newer than the signature\n"
+msgstr[1] "public key %s is %lu seconds newer than the signature\n"
+
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
+#, c-format
+msgid "public key %s is %lu day newer than the signature\n"
+msgid_plural "public key %s is %lu days newer than the signature\n"
+msgstr[0] "public key %s is %lu day newer than the signature\n"
+msgstr[1] "public key %s is %lu days newer than the signature\n"
+
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr[0] ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr[1] ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
+#, c-format
+msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu days in the future (time warp or clock problem)\n"
+msgstr[0] ""
+"key %s was created %lu day in the future (time warp or clock problem)\n"
+msgstr[1] ""
+"key %s was created %lu days in the future (time warp or clock problem)\n"
+
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
+#, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "Note: signature key %s has been revoked\n"
+
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
+#, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
+
- #: g10/sig-check.c:801
++#: g10/sig-check.c:1043
+#, 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:836
++#: g10/sig-check.c:1046
+#, 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
++#: g10/sign.c:88
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+
- #: g10/sign.c:115
++#: g10/sign.c:114
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+
- #: g10/sign.c:138
++#: g10/sign.c:137
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+
- #: g10/sign.c:301
++#: g10/sign.c:300
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “%s”\n"
+
- #: g10/sign.c:849
++#: 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:980
++#: g10/sign.c:979
+msgid "signing:"
+msgstr "signing:"
+
- #: g10/sign.c:1256
++#: g10/sign.c:1255
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
+msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
+
- #: g10/skclist.c:188
++#: g10/skclist.c:187
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “%s”: duplicated\n"
+
- #: g10/skclist.c:207
++#: g10/skclist.c:206
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
- #: g10/skclist.c:226
++#: g10/skclist.c:225
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
+msgstr ""
+"this is a PGP generated Elgamal key which is not secure for signatures!"
+
- #: g10/tdbdump.c:58 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "trust record %lu, type %d: write failed: %s\n"
+
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use “gpg --import-ownertrust” to restore them)\n"
+
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
+#, c-format
+msgid "error in '%s': %s\n"
+msgstr "error in '%s': %s\n"
+
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
+msgid "line too long"
+msgstr "line too long"
+
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
+msgid "colon missing"
+msgstr "colon missing"
+
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
+msgid "invalid fingerprint"
+msgstr "invalid fingerprint"
+
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
+msgid "ownertrust value missing"
+msgstr "ownertrust value missing"
+
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
+#, c-format
+msgid "error finding trust record in '%s': %s\n"
+msgstr "error finding trust record in '%s': %s\n"
+
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
+#, c-format
+msgid "read error in '%s': %s\n"
+msgstr "read error in '%s': %s\n"
+
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
+#, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "can't create lock for ‘%s’\n"
+
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "can't lock ‘%s’\n"
+
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
+#, 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:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
+#, 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
++#: g10/tdbio.c:351
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaction too large\n"
+
- #: 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
++#: g10/tdbio.c:675
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
++#, c-format
++msgid "can't access '%s': %s\n"
++msgstr "can't access '%s': %s\n"
++
++#: g10/tdbio.c:717
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
+msgid "Note: trustdb not writable\n"
+msgstr "Note: trustdb not writable\n"
+
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
+#, 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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "Error: The trustdb is corrupted.\n"
+
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "can't handle text lines longer than %d characters\n"
+
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "input line longer than %d characters\n"
+
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
+#, c-format
+msgid "error beginning transaction on TOFU database: %s\n"
+msgstr "error beginning transaction on TOFU database: %s\n"
+
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
+#, c-format
+msgid "error committing transaction on TOFU database: %s\n"
+msgstr "error committing transaction on TOFU database: %s\n"
+
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
+#, c-format
+msgid "error rolling back transaction on TOFU database: %s\n"
+msgstr "error rolling back transaction on TOFU database: %s\n"
+
- #: g10/tofu.c:451
++#: g10/tofu.c:512
+#, c-format
+msgid "unsupported TOFU database version: %s\n"
+msgstr "unsupported TOFU database version: %s\n"
+
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
+#, c-format
+msgid "error reading TOFU database: %s\n"
+msgstr "error reading TOFU database: %s\n"
+
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
+#, c-format
+msgid "error determining TOFU database's version: %s\n"
+msgstr "error determining TOFU database's version: %s\n"
+
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
+#, c-format
+msgid "error initializing TOFU database: %s\n"
+msgstr "error initializing TOFU database: %s\n"
+
- #: g10/tofu.c:700
++#: g10/tofu.c:761
+#, c-format
+msgid "error opening TOFU database '%s': %s\n"
+msgstr "error opening TOFU database '%s': %s\n"
+
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
+msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
+msgstr "Warning: Home directory contains both tofu.db and tofu.d.\n"
+
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
+msgid "Using split format for TOFU database\n"
+msgstr "Using split format for TOFU database\n"
+
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
+#, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "error updating TOFU database: %s\n"
+
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
+#, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "error setting TOFU binding's trust level to %s\n"
+
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
+#, c-format
+msgid "The binding %s is NOT known."
+msgstr "The binding %s is NOT known."
+
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
+#, c-format
+msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
++"The key with fingerprint %s raised a conflict with the binding %s. Since "
++"this binding's policy was 'auto', it was changed to 'ask'."
+msgstr ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
++"The key with fingerprint %s raised a conflict with the binding %s. Since "
++"this binding's policy was 'auto', it was changed to 'ask'."
+
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
+#, c-format
+msgid ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+msgstr ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
+msgid "Known user IDs associated with this key:\n"
+msgstr "Known user IDs associated with this key:\n"
+
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
+#, c-format
+msgid "The email address \"%s\" is associated with %d key:\n"
+msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+msgstr[0] "The email address “%s” is associated with %d key:\n"
+msgstr[1] "The email address “%s” is associated with %d keys:\n"
+
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
+#, c-format
+msgid "Statistics for keys with the email address \"%s\":\n"
+msgstr "Statistics for keys with the email address “%s”:\n"
+
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
+msgid "this key"
+msgstr "this key"
+
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
+#, c-format
+msgid "%ld message signed in the future."
+msgid_plural "%ld messages signed in the future."
+msgstr[0] "%ld message signed in the future."
+msgstr[1] "%ld messages signed in the future."
+
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
+#, c-format
+msgid "%ld message signed"
+msgid_plural "%ld messages signed"
+msgstr[0] "%ld message signed"
+msgstr[1] "%ld messages signed"
+
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
+#, c-format
+msgid " over the past %ld day."
+msgid_plural " over the past %ld days."
+msgstr[0] " over the past %ld day."
+msgstr[1] " over the past %ld days."
+
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
+#, c-format
+msgid " over the past %ld week."
+msgid_plural " over the past %ld weeks."
+msgstr[0] " over the past %ld week."
+msgstr[1] " over the past %ld weeks."
+
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
+#, c-format
+msgid " over the past %ld month."
+msgid_plural " over the past %ld months."
+msgstr[0] " over the past %ld month."
+msgstr[1] " over the past %ld months."
+
+#. TRANSLATORS: Please translate the text found in the source
+#. file below. We don't directly internationalize that text
+#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
+msgid "TOFU detected a binding conflict"
+msgstr "TOFU detected a binding conflict"
+
+#. TRANSLATORS: Two letters (normally the lower and upper case
+#. version of the hotkey) for each of the five choices. If
+#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
+msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
+msgstr "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
+
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
- #: g10/tofu.c:2252
++#. TRANSLATORS: The tilde ('~') is used here to indicate a
++#. * non-breakable space
++#: g10/tofu.c:2317
+#, c-format
- msgid "%d year"
- msgid_plural "%d years"
- msgstr[0] "%d year"
- msgstr[1] "%d years"
++msgid "%d~year"
++msgid_plural "%d~years"
++msgstr[0] "%d~year"
++msgstr[1] "%d~years"
+
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
+#, c-format
- msgid "%d month"
- msgid_plural "%d months"
- msgstr[0] "%d month"
- msgstr[1] "%d months"
++msgid "%d~month"
++msgid_plural "%d~months"
++msgstr[0] "%d~month"
++msgstr[1] "%d~months"
+
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
+#, c-format
- msgid "%d day"
- msgid_plural "%d days"
- msgstr[0] "%d day"
- msgstr[1] "%d days"
++msgid "%d~day"
++msgid_plural "%d~days"
++msgstr[0] "%d~day"
++msgstr[1] "%d~days"
+
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
+#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
- msgstr[0] "%d hour"
- msgstr[1] "%d hours"
++msgid "%d~hour"
++msgid_plural "%d~hours"
++msgstr[0] "%d~hour"
++msgstr[1] "%d~hours"
+
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
+#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
- msgstr[0] "%d minute"
- msgstr[1] "%d minutes"
++msgid "%d~minute"
++msgid_plural "%d~minutes"
++msgstr[0] "%d~minute"
++msgstr[1] "%d~minutes"
+
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
+#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
- msgstr[0] "%d second"
- msgstr[1] "%d seconds"
++msgid "%d~second"
++msgid_plural "%d~seconds"
++msgstr[0] "%d~second"
++msgstr[1] "%d~seconds"
+
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
+#, c-format
+msgid "Have never verified a message signed by key %s!\n"
+msgstr "Have never verified a message signed by key %s!\n"
+
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
+#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
- msgstr "Failed to collect signature statistics for “%s” (key %s)\n"
++msgid ""
++"Failed to collect signature statistics for \"%s\"\n"
++"(key %s)\n"
++msgstr ""
++"Failed to collect signature statistics for “%s”\n"
++"(key %s)\n"
+
- #: g10/tofu.c:2415
++#: g10/tofu.c:2499
+#, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr "Verified 0 messages signed by “%s” (key: %s, policy: %s)."
++msgid "Verified %ld messages signed by \"%s\"."
++msgstr "Verified %ld messages signed by “%s”."
+
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
+#, c-format
+msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
++"Verified %ld message signed by \"%s\"\n"
++"in the past %s."
+msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
++"Verified %ld messages signed by \"%s\"\n"
++"in the past %s."
+msgstr[0] ""
- "Verified %ld message signed by “%s” (key: %s, policy: %s) in the past %s."
++"Verified %ld message signed by “%s”\n"
++"in the past %s."
+msgstr[1] ""
- "Verified %ld messages signed by “%s” (key: %s, policy: %s) in the past %s."
++"Verified %ld messages signed by “%s”\n"
++"in the past %s."
+
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
+#, c-format
+msgid "The most recent message was verified %s ago."
+msgstr "The most recent message was verified %s ago."
+
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
+msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgstr "Warning: we've have yet to see a message signed by this key!\n"
+
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
+msgid "Warning: we've only seen a single message signed by this key!\n"
+msgstr "Warning: we've only seen a single message signed by this key!\n"
+
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
+#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
- msgstr[0] "TOFU: few signatures %d message %s"
- msgstr[1] "TOFU: few signatures %d messages %s"
++msgid ""
++"Warning: if you think you've seen more than %ld message signed by this key, "
++"then this key might be a forgery! Carefully examine the email address for "
++"small variations. If the key is suspect, then use\n"
++" %s\n"
++"to mark it as being bad.\n"
++msgid_plural ""
++"Warning: if you think you've seen more than %ld messages signed by this key, "
++"then this key might be a forgery! Carefully examine the email address for "
++"small variations. If the key is suspect, then use\n"
++" %s\n"
++"to mark it as being bad.\n"
++msgstr[0] ""
++"Warning: if you think you've seen more than %ld message signed by this key, "
++"then this key might be a forgery! Carefully examine the email address for "
++"small variations. If the key is suspect, then use\n"
++" %s\n"
++"to mark it as being bad.\n"
++msgstr[1] ""
++"Warning: if you think you've seen more than %ld messages signed by this key, "
++"then this key might be a forgery! Carefully examine the email address for "
++"small variations. If the key is suspect, then use\n"
++" %s\n"
++"to mark it as being bad.\n"
+
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "‘%s’ is not a valid long keyID\n"
+
- #: g10/trustdb.c:242
++#: g10/trustdb.c:241
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
+
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
+#, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "key %s occurs more than once in the trustdb\n"
+
- #: g10/trustdb.c:295
++#: g10/trustdb.c:294
+#, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "key %s: no public key for trusted key - skipped\n"
+
- #: g10/trustdb.c:305
++#: g10/trustdb.c:304
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
+
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "trust record %lu, req type %d: read failed: %s\n"
+
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "trust record %lu is not of requested type %d\n"
+
- #: g10/trustdb.c:422
++#: g10/trustdb.c:421
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr "You may try to re-create the trustdb using the commands:\n"
+
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
+msgid "If that does not work, please consult the manual\n"
+msgstr "If that does not work, please consult the manual\n"
+
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
+
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
+#, c-format
+msgid "using %s trust model\n"
+msgstr "using %s trust model\n"
+
+#: g10/trustdb.c:510
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
+#: g10/trustdb.c:525
+#, c-format
+msgid "no need for a trustdb check with '%s' trust model\n"
+msgstr "no need for a trustdb check with ‘%s’ trust model\n"
+
+#: g10/trustdb.c:541
+#, c-format
+msgid "no need for a trustdb update with '%s' trust model\n"
+msgstr "no need for a trustdb update with ‘%s’ trust model\n"
+
+#: g10/trustdb.c:965
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:970
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
+#: g10/trustdb.c:1850
+#, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%d key processed"
+msgstr[1] "%d keys processed"
+
+#: g10/trustdb.c:1853
+#, c-format
+msgid " (%d validity count cleared)\n"
+msgid_plural " (%d validity counts cleared)\n"
+msgstr[0] " (%d validity count cleared)\n"
+msgstr[1] " (%d validity counts cleared)\n"
+
+#: g10/trustdb.c:1923
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
+#: g10/trustdb.c:1937
+#, 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:2051
++#: g10/trustdb.c:2054
+#, 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:2130
++#: g10/trustdb.c:2134
+#, 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
++#: g10/trust.c:105
+msgid "undefined"
+msgstr "undefined"
+
- #: g10/trust.c:107
++#: g10/trust.c:106
+msgid "never"
+msgstr "never"
+
- #: g10/trust.c:108
++#: g10/trust.c:107
+msgid "marginal"
+msgstr "marginal"
+
- #: g10/trust.c:109
++#: g10/trust.c:108
+msgid "full"
+msgstr "full"
+
- #: g10/trust.c:110
++#: g10/trust.c:109
+msgid "ultimate"
+msgstr "ultimate"
+
+#. TRANSLATORS: these strings are similar to those in
+#. trust_value_to_string(), but are a fixed length. This is needed to
+#. make attractive information listings where columns line up
+#. properly. The value "10" should be the length of the strings you
+#. choose to translate to. This is the length in printable columns.
+#. It gets passed to atoi() so everything after the number is
+#. essentially a comment and need not be translated. Either key and
+#. uid are both NULL, or neither are NULL.
- #: g10/trust.c:147
++#: g10/trust.c:146
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trust.c:uid_trust_string_fixed"
+
- #: g10/trust.c:150
++#: g10/trust.c:149
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
+msgid "[ expired]"
+msgstr "[ expired]"
+
- #: g10/trust.c:157
++#: g10/trust.c:156
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
- #: g10/trust.c:159
++#: g10/trust.c:158
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
- #: g10/trust.c:160
++#: g10/trust.c:159
+msgid "[marginal]"
+msgstr "[marginal]"
+
- #: g10/trust.c:161
++#: g10/trust.c:160
+msgid "[ full ]"
+msgstr "[ full ]"
+
- #: g10/trust.c:162
++#: g10/trust.c:161
+msgid "[ultimate]"
+msgstr "[ultimate]"
+
- #: g10/verify.c:118
++#: g10/verify.c:117
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+
- #: g10/verify.c:205
++#: g10/verify.c:204
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "input line %u too long or missing LF\n"
+
- #: g10/verify.c:254
++#: g10/verify.c:253
+#, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "can't open fd %d: %s\n"
+
+#: kbx/kbxutil.c:92
+msgid "set debugging flags"
+msgstr "set debugging flags"
+
+#: kbx/kbxutil.c:93
+msgid "enable full debugging"
+msgstr "enable full debugging"
+
+#: kbx/kbxutil.c:117
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Usage: kbxutil [options] [files] (-h for help)"
+
+#: kbx/kbxutil.c:120
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+msgstr ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+
+#: scd/app-nks.c:714 scd/app-openpgp.c:2995
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA modulus missing or not of size %d bits\n"
+
+#: scd/app-nks.c:722 scd/app-openpgp.c:3007
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA public exponent missing or larger than %d bits\n"
+
+#: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
+#: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
+#: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN callback returned error: %s\n"
+
+#: scd/app-nks.c:835
+msgid "the NullPIN has not yet been changed\n"
+msgstr "the NullPIN has not yet been changed\n"
+
+#: scd/app-nks.c:1096
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "|N|Please enter a new PIN for the standard keys."
+
+#: scd/app-nks.c:1097
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Please enter the PIN for the standard keys."
+
+#: scd/app-nks.c:1103
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+
+#: scd/app-nks.c:1105
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+
+#: scd/app-nks.c:1113
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
+
+#: scd/app-nks.c:1115
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Please enter the PIN for the key to create qualified signatures."
+
+#: scd/app-nks.c:1123
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+
+#: scd/app-nks.c:1125
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+
+#: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error getting new PIN: %s\n"
+
+#: scd/app-openpgp.c:805
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
+#: scd/app-openpgp.c:818
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "failed to store the creation date: %s\n"
+
+#: scd/app-openpgp.c:1286
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "reading public key failed: %s\n"
+
+#: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
+msgid "response does not contain the public key data\n"
+msgstr "response does not contain the public key data\n"
+
+#: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
+msgid "response does not contain the RSA public exponent\n"
+msgstr "response does not contain the RSA public exponent\n"
+
+#: scd/app-openpgp.c:1322
+msgid "response does not contain the EC public point\n"
+msgstr "response does not contain the EC public point\n"
+
+#: scd/app-openpgp.c:1708
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
+#: scd/app-openpgp.c:1715
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
+
+#: scd/app-openpgp.c:1730
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
+
+#: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN for CHV%d is too short; minimum length is %d\n"
+
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
+#: scd/app-openpgp.c:3937
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verify CHV%d failed: %s\n"
+
+#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: scd/app-openpgp.c:1877
+#, c-format
+msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgid_plural ""
+"%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string. Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1887
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+
+#: scd/app-openpgp.c:1891
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: scd/app-openpgp.c:1912
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: scd/app-openpgp.c:2265
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "Reset Code is too short; minimum length is %d\n"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:2298
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2299
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2299
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: scd/app-openpgp.c:2370
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||Please enter the Admin PIN and New Admin PIN"
+
+#: scd/app-openpgp.c:2371
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2443
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2447
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2449
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2451
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA prime %s missing or not of size %d bits\n"
+
+#: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: scd/app-openpgp.c:3320
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: scd/app-openpgp.c:3577
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: scd/app-openpgp.c:3590
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: scd/app-openpgp.c:3596
+#, c-format
+msgid "key generation completed (%d second)\n"
+msgid_plural "key generation completed (%d seconds)\n"
+msgstr[0] "key generation completed (%d second)\n"
+msgstr[1] "key generation completed (%d seconds)\n"
+
+#: scd/app-openpgp.c:3661
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: scd/app-openpgp.c:3711
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: scd/app-openpgp.c:3827
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: scd/app-openpgp.c:3912
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: scd/app-openpgp.c:4365
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"verification of Admin PIN is currently prohibited through this command\n"
+
+#: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "can't access %s - invalid OpenPGP card?\n"
+
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's pinpad"
+msgstr "||Please enter your PIN at the reader's pinpad"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-dinsig.c:529
+msgid "|N|Initial New PIN"
+msgstr "|N|Initial New PIN"
+
+#: scd/scdaemon.c:114
+msgid "run in multi server mode (foreground)"
+msgstr "run in multi server mode (foreground)"
+
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 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:655
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|write a log to FILE"
+
+#: scd/scdaemon.c:134
+msgid "|N|connect to reader at port N"
+msgstr "|N|connect to reader at port N"
+
+#: scd/scdaemon.c:136
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAME|use NAME as ct-API driver"
+
+#: scd/scdaemon.c:138
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAME|use NAME as PC/SC driver"
+
+#: scd/scdaemon.c:141
+msgid "do not use the internal CCID driver"
+msgstr "do not use the internal CCID driver"
+
+#: scd/scdaemon.c:147
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr "|N|disconnect the card after N seconds of inactivity"
+
+#: scd/scdaemon.c:150
+msgid "do not use a reader's pinpad"
+msgstr "do not use a reader's pinpad"
+
+#: scd/scdaemon.c:155
+msgid "deny the use of admin card commands"
+msgstr "deny the use of admin card commands"
+
+#: scd/scdaemon.c:158
+msgid "use variable length input for pinpad"
+msgstr "use variable length input for pinpad"
+
+#: scd/scdaemon.c: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:1159 dirmngr/dirmngr.c:1999
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
+#: 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:261 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:527
+msgid "looking up issuer at external location\n"
+msgstr "looking up issuer at external location\n"
+
+#: sm/certchain.c:546
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr "number of issuers matching: %d\n"
+
+#: sm/certchain.c:590
+msgid "looking up issuer from the Dirmngr cache\n"
+msgstr "looking up issuer from the Dirmngr cache\n"
+
+#: sm/certchain.c:614
+#, c-format
+msgid "number of matching certificates: %d\n"
+msgstr "number of matching certificates: %d\n"
+
+#: sm/certchain.c:616
+#, c-format
+msgid "dirmngr cache-only key lookup failed: %s\n"
+msgstr "dirmngr cache-only key lookup failed: %s\n"
+
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
+msgid "failed to allocate keyDB handle\n"
+msgstr "failed to allocate keyDB handle\n"
+
+#: sm/certchain.c:981
+msgid "certificate has been revoked"
+msgstr "certificate has been revoked"
+
+#: sm/certchain.c:996
+msgid "the status of the certificate is unknown"
+msgstr "the status of the certificate is unknown"
+
+#: sm/certchain.c:1003
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr "please make sure that the “dirmngr” is properly installed\n"
+
+#: sm/certchain.c:1009
+#, c-format
+msgid "checking the CRL failed: %s"
+msgstr "checking the CRL failed: %s"
+
+#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
+#, c-format
+msgid "certificate with invalid validity: %s"
+msgstr "certificate with invalid validity: %s"
+
+#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
+msgid "certificate not yet valid"
+msgstr "certificate not yet valid"
+
+#: sm/certchain.c:1054 sm/certchain.c:1139
+msgid "root certificate not yet valid"
+msgstr "root certificate not yet valid"
+
+#: sm/certchain.c:1055 sm/certchain.c:1140
+msgid "intermediate certificate not yet valid"
+msgstr "intermediate certificate not yet valid"
+
+#: sm/certchain.c:1068 dirmngr/validate.c:502
+msgid "certificate has expired"
+msgstr "certificate has expired"
+
+#: sm/certchain.c:1069
+msgid "root certificate has expired"
+msgstr "root certificate has expired"
+
+#: sm/certchain.c:1070
+msgid "intermediate certificate has expired"
+msgstr "intermediate certificate has expired"
+
+#: sm/certchain.c:1112
+#, c-format
+msgid "required certificate attributes missing: %s%s%s"
+msgstr "required certificate attributes missing: %s%s%s"
+
+#: sm/certchain.c:1121
+msgid "certificate with invalid validity"
+msgstr "certificate with invalid validity"
+
+#: sm/certchain.c:1158
+msgid "signature not created during lifetime of certificate"
+msgstr "signature not created during lifetime of certificate"
+
+#: sm/certchain.c:1160
+msgid "certificate not created during lifetime of issuer"
+msgstr "certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1161
+msgid "intermediate certificate not created during lifetime of issuer"
+msgstr "intermediate certificate not created during lifetime of issuer"
+
+#: sm/certchain.c:1165
+msgid " ( signature created at "
+msgstr " ( signature created at "
+
+#: sm/certchain.c:1166
+msgid " (certificate created at "
+msgstr " (certificate created at "
+
+#: sm/certchain.c:1169
+msgid " (certificate valid from "
+msgstr " (certificate valid from "
+
+#: sm/certchain.c:1170
+msgid " ( issuer valid from "
+msgstr " ( issuer valid from "
+
+#: sm/certchain.c:1200 dirmngr/validate.c:552
+#, c-format
+msgid "fingerprint=%s\n"
+msgstr "fingerprint=%s\n"
+
+#: sm/certchain.c:1209
+msgid "root certificate has now been marked as trusted\n"
+msgstr "root certificate has now been marked as trusted\n"
+
+#: sm/certchain.c:1222
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr "interactive marking as trusted not enabled in gpg-agent\n"
+
+#: sm/certchain.c:1228
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr "interactive marking as trusted disabled for this session\n"
+
+#: sm/certchain.c:1286
+msgid "WARNING: creation time of signature not known - assuming current time"
+msgstr "WARNING: creation time of signature not known - assuming current time"
+
+#: sm/certchain.c:1350
+msgid "no issuer found in certificate"
+msgstr "no issuer found in certificate"
+
+#: sm/certchain.c:1428
+msgid "self-signed certificate has a BAD signature"
+msgstr "self-signed certificate has a BAD signature"
+
+#: sm/certchain.c:1497 dirmngr/validate.c:550
+msgid "root certificate is not marked trusted"
+msgstr "root certificate is not marked trusted"
+
+#: sm/certchain.c:1513
+#, c-format
+msgid "checking the trust list failed: %s\n"
+msgstr "checking the trust list failed: %s\n"
+
+#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
+msgid "certificate chain too long\n"
+msgstr "certificate chain too long\n"
+
+#: sm/certchain.c:1556 dirmngr/validate.c:617
+msgid "issuer certificate not found"
+msgstr "issuer certificate not found"
+
+#: sm/certchain.c:1589 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: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:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
+#, c-format
+msgid "error locking keybox: %s\n"
+msgstr "error locking keybox: %s\n"
+
+#: sm/delete.c:143
+#, c-format
+msgid "duplicated certificate '%s' deleted\n"
+msgstr "duplicated certificate ‘%s’ deleted\n"
+
+#: sm/delete.c:145
+#, c-format
+msgid "certificate '%s' deleted\n"
+msgstr "certificate ‘%s’ deleted\n"
+
+#: sm/delete.c:175
+#, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "deleting certificate “%s” failed: %s\n"
+
+#: sm/encrypt.c:328
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
+msgid "list external keys"
+msgstr "list external keys"
+
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
+msgid "import certificates"
+msgstr "import certificates"
+
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
+msgid "export certificates"
+msgstr "export certificates"
+
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|write a server mode log to FILE"
+
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
+msgid ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+msgstr ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
+#, c-format
+msgid "Note: won't be able to encrypt to '%s': %s\n"
+msgstr "Note: won't be able to encrypt to '%s': %s\n"
+
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘%s’\n"
+
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "%s:%u: no hostname given\n"
+
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: password given without user\n"
+
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘%s’\n"
+
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
+msgid "invalid command (there is no implicit command)\n"
+msgstr "invalid command (there is no implicit command)\n"
+
+#: sm/import.c:127
+#, c-format
+msgid "total number processed: %lu\n"
+msgstr "total number processed: %lu\n"
+
+#: sm/import.c:246
+msgid "error storing certificate\n"
+msgstr "error storing certificate\n"
+
+#: sm/import.c:254
+msgid "basic certificate checks failed - not imported\n"
+msgstr "basic certificate checks failed - not imported\n"
+
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
+#, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "error getting stored flags: %s\n"
+
+#: sm/import.c:526 sm/import.c:558
+#, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error importing certificate: %s\n"
+
+#: sm/import.c:746 tools/gpg-connect-agent.c:1434
+#, c-format
+msgid "error reading input: %s\n"
+msgstr "error reading input: %s\n"
+
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr "problem looking for existing certificate: %s\n"
+
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
+#, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error finding writable keyDB: %s\n"
+
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
+#, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error storing certificate: %s\n"
+
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "problem re-searching certificate: %s\n"
+
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
+#, c-format
+msgid "error storing flags: %s\n"
+msgstr "error storing flags: %s\n"
+
+#: sm/keylist.c:658
+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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
+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:384
++#: dirmngr/dirmngr-client.c:390
+#, 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:2207
+#, c-format
+msgid "error closing cache file: %s\n"
+msgstr "error closing cache file: %s\n"
+
+#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
+#, c-format
+msgid "failed to open cache dir file '%s': %s\n"
+msgstr "failed to open cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:421
+#, c-format
+msgid "error creating new cache dir file '%s': %s\n"
+msgstr "error creating new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:428
+#, c-format
+msgid "error writing new cache dir file '%s': %s\n"
+msgstr "error writing new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:435
+#, c-format
+msgid "error closing new cache dir file '%s': %s\n"
+msgstr "error closing new cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:440
+#, c-format
+msgid "new cache dir file '%s' created\n"
+msgstr "new cache dir file ‘%s’ created\n"
+
+#: dirmngr/crlcache.c:445
+#, c-format
+msgid "failed to re-open cache dir file '%s': %s\n"
+msgstr "failed to re-open cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:473
+#, c-format
+msgid "first record of '%s' is not the version\n"
+msgstr "first record of ‘%s’ is not the version\n"
+
+#: dirmngr/crlcache.c:488
+msgid "old version of cache directory - cleaning up\n"
+msgstr "old version of cache directory - cleaning up\n"
+
+#: dirmngr/crlcache.c:504
+msgid "old version of cache directory - giving up\n"
+msgstr "old version of cache directory - giving up\n"
+
+#: dirmngr/crlcache.c:615
+#, c-format
+msgid "extra field detected in crl record of '%s' line %u\n"
+msgstr "extra field detected in crl record of ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:623
+#, c-format
+msgid "invalid line detected in '%s' line %u\n"
+msgstr "invalid line detected in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:632
+#, c-format
+msgid "duplicate entry detected in '%s' line %u\n"
+msgstr "duplicate entry detected in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:647
+#, c-format
+msgid "unsupported record type in '%s' line %u skipped\n"
+msgstr "unsupported record type in ‘%s’ line %u skipped\n"
+
+#: dirmngr/crlcache.c:673
+#, c-format
+msgid "invalid issuer hash in '%s' line %u\n"
+msgstr "invalid issuer hash in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:679
+#, c-format
+msgid "no issuer DN in '%s' line %u\n"
+msgstr "no issuer DN in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:686
+#, c-format
+msgid "invalid timestamp in '%s' line %u\n"
+msgstr "invalid timestamp in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:692
+#, c-format
+msgid "WARNING: invalid cache file hash in '%s' line %u\n"
+msgstr "WARNING: invalid cache file hash in ‘%s’ line %u\n"
+
+#: dirmngr/crlcache.c:698
+msgid "detected errors in cache dir file\n"
+msgstr "detected errors in cache dir file\n"
+
+#: dirmngr/crlcache.c:699
+msgid "please check the reason and manually delete that file\n"
+msgstr "please check the reason and manually delete that file\n"
+
+#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
+#, c-format
+msgid "failed to create temporary cache dir file '%s': %s\n"
+msgstr "failed to create temporary cache dir file '%s': %s\n"
+
+#: dirmngr/crlcache.c:937
+#, c-format
+msgid "error closing '%s': %s\n"
+msgstr "error closing '%s': %s\n"
+
+#: dirmngr/crlcache.c:949
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "error renaming ‘%s’ to '%s': %s\n"
+
+#: dirmngr/crlcache.c:1003
+#, c-format
+msgid "can't hash '%s': %s\n"
+msgstr "can't hash '%s': %s\n"
+
+#: dirmngr/crlcache.c:1011
+#, c-format
+msgid "error setting up MD5 hash context: %s\n"
+msgstr "error setting up MD5 hash context: %s\n"
+
+#: dirmngr/crlcache.c:1027
+#, c-format
+msgid "error hashing '%s': %s\n"
+msgstr "error hashing '%s': %s\n"
+
+#: dirmngr/crlcache.c:1055
+#, c-format
+msgid "invalid formatted checksum for '%s'\n"
+msgstr "invalid formatted checksum for ‘%s’\n"
+
+#: dirmngr/crlcache.c:1108
+msgid "too many open cache files; can't open anymore\n"
+msgstr "too many open cache files; can't open anymore\n"
+
+#: dirmngr/crlcache.c:1126
+#, c-format
+msgid "opening cache file '%s'\n"
+msgstr "opening cache file ‘%s’\n"
+
+#: dirmngr/crlcache.c:1145
+#, c-format
+msgid "error opening cache file '%s': %s\n"
+msgstr "error opening cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:1154
+#, c-format
+msgid "error initializing cache file '%s' for reading: %s\n"
+msgstr "error initializing cache file ‘%s’ for reading: %s\n"
+
+#: dirmngr/crlcache.c:1175
+msgid "calling unlock_db_file on a closed file\n"
+msgstr "calling unlock_db_file on a closed file\n"
+
+#: dirmngr/crlcache.c:1177
+msgid "calling unlock_db_file on an unlocked file\n"
+msgstr "calling unlock_db_file on an unlocked file\n"
+
+#: dirmngr/crlcache.c:1231
+#, c-format
+msgid "failed to create a new cache object: %s\n"
+msgstr "failed to create a new cache object: %s\n"
+
+#: dirmngr/crlcache.c:1286
+#, c-format
+msgid "no CRL available for issuer id %s\n"
+msgstr "no CRL available for issuer id %s\n"
+
+#: dirmngr/crlcache.c:1293
+#, c-format
+msgid "cached CRL for issuer id %s too old; update required\n"
+msgstr "cached CRL for issuer id %s too old; update required\n"
+
+#: dirmngr/crlcache.c:1307
+#, c-format
+msgid ""
+"force-crl-refresh active and %d minutes passed for issuer id %s; update "
+"required\n"
+msgstr ""
+"force-crl-refresh active and %d minutes passed for issuer id %s; update "
+"required\n"
+
+#: dirmngr/crlcache.c:1315
+#, c-format
+msgid "force-crl-refresh active for issuer id %s; update required\n"
+msgstr "force-crl-refresh active for issuer id %s; update required\n"
+
+#: dirmngr/crlcache.c:1324
+#, c-format
+msgid "available CRL for issuer ID %s can't be used\n"
+msgstr "available CRL for issuer ID %s can't be used\n"
+
+#: dirmngr/crlcache.c:1335
+#, c-format
+msgid "cached CRL for issuer id %s tampered; we need to update\n"
+msgstr "cached CRL for issuer id %s tampered; we need to update\n"
+
+#: dirmngr/crlcache.c:1347
+msgid "WARNING: invalid cache record length for S/N "
+msgstr "WARNING: invalid cache record length for S/N "
+
+#: dirmngr/crlcache.c:1357
+#, c-format
+msgid "problem reading cache record for S/N %s: %s\n"
+msgstr "problem reading cache record for S/N %s: %s\n"
+
+#: dirmngr/crlcache.c:1360
+#, c-format
+msgid "S/N %s is not valid; reason=%02X date=%.15s\n"
+msgstr "S/N %s is not valid; reason=%02X date=%.15s\n"
+
+#: dirmngr/crlcache.c:1371
+#, c-format
+msgid "S/N %s is valid, it is not listed in the CRL\n"
+msgstr "S/N %s is valid, it is not listed in the CRL\n"
+
+#: dirmngr/crlcache.c:1379
+#, c-format
+msgid "error getting data from cache file: %s\n"
+msgstr "error getting data from cache file: %s\n"
+
+#: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
+#, c-format
+msgid "unknown hash algorithm '%s'\n"
+msgstr "unknown hash algorithm ‘%s’\n"
+
+#: dirmngr/crlcache.c:1549
+#, c-format
+msgid "gcry_md_open for algorithm %d failed: %s\n"
+msgstr "gcry_md_open for algorithm %d failed: %s\n"
+
+#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
+msgid "got an invalid S-expression from libksba\n"
+msgstr "got an invalid S-expression from libksba\n"
+
+#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
+#, c-format
+msgid "converting S-expression failed: %s\n"
+msgstr "converting S-expression failed: %s\n"
+
+#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
+#, c-format
+msgid "creating S-expression failed: %s\n"
+msgstr "creating S-expression failed: %s\n"
+
+#: dirmngr/crlcache.c:1699
+#, c-format
+msgid "ksba_crl_parse failed: %s\n"
+msgstr "ksba_crl_parse failed: %s\n"
+
+#: dirmngr/crlcache.c:1714
+#, c-format
+msgid "error getting update times of CRL: %s\n"
+msgstr "error getting update times of CRL: %s\n"
+
+#: dirmngr/crlcache.c:1721
+#, c-format
+msgid "update times of this CRL: this=%s next=%s\n"
+msgstr "update times of this CRL: this=%s next=%s\n"
+
+#: dirmngr/crlcache.c:1725
+msgid "nextUpdate not given; assuming a validity period of one day\n"
+msgstr "nextUpdate not given; assuming a validity period of one day\n"
+
+#: dirmngr/crlcache.c:1745
+#, c-format
+msgid "error getting CRL item: %s\n"
+msgstr "error getting CRL item: %s\n"
+
+#: dirmngr/crlcache.c:1760
+#, c-format
+msgid "error inserting item into temporary cache file: %s\n"
+msgstr "error inserting item into temporary cache file: %s\n"
+
+#: dirmngr/crlcache.c:1787
+#, c-format
+msgid "no CRL issuer found in CRL: %s\n"
+msgstr "no CRL issuer found in CRL: %s\n"
+
+#: dirmngr/crlcache.c:1802
+msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
+msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
+
+#: dirmngr/crlcache.c:1847
+#, c-format
+msgid "CRL signature verification failed: %s\n"
+msgstr "CRL signature verification failed: %s\n"
+
+#: dirmngr/crlcache.c:1858
+#, c-format
+msgid "error checking validity of CRL issuer certificate: %s\n"
+msgstr "error checking validity of CRL issuer certificate: %s\n"
+
+#: dirmngr/crlcache.c:2001
+#, c-format
+msgid "ksba_crl_new failed: %s\n"
+msgstr "ksba_crl_new failed: %s\n"
+
+#: dirmngr/crlcache.c:2008
+#, c-format
+msgid "ksba_crl_set_reader failed: %s\n"
+msgstr "ksba_crl_set_reader failed: %s\n"
+
+#: dirmngr/crlcache.c:2042
+#, c-format
+msgid "removed stale temporary cache file '%s'\n"
+msgstr "removed stale temporary cache file ‘%s’\n"
+
+#: dirmngr/crlcache.c:2046
+#, c-format
+msgid "problem removing stale temporary cache file '%s': %s\n"
+msgstr "problem removing stale temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2056
+#, c-format
+msgid "error creating temporary cache file '%s': %s\n"
+msgstr "error creating temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2066
+#, c-format
+msgid "crl_parse_insert failed: %s\n"
+msgstr "crl_parse_insert failed: %s\n"
+
+#: dirmngr/crlcache.c:2076
+#, c-format
+msgid "error finishing temporary cache file '%s': %s\n"
+msgstr "error finishing temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2083
+#, c-format
+msgid "error closing temporary cache file '%s': %s\n"
+msgstr "error closing temporary cache file '%s': %s\n"
+
+#: dirmngr/crlcache.c:2108
+#, c-format
+msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
+msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
+
+#: dirmngr/crlcache.c:2112
+#, c-format
+msgid "new CRL still too old; it expired on %s\n"
+msgstr "new CRL still too old; it expired on %s\n"
+
+#: dirmngr/crlcache.c:2128
+#, c-format
+msgid "unknown critical CRL extension %s\n"
+msgstr "unknown critical CRL extension %s\n"
+
+#: dirmngr/crlcache.c:2138
+#, c-format
+msgid "error reading CRL extensions: %s\n"
+msgstr "error reading CRL extensions: %s\n"
+
+#: dirmngr/crlcache.c:2189
+#, c-format
+msgid "creating cache file '%s'\n"
+msgstr "creating cache file ‘%s’\n"
+
+#: dirmngr/crlcache.c:2221
+#, c-format
+msgid "problem renaming '%s' to '%s': %s\n"
+msgstr "problem renaming ‘%s’ to '%s': %s\n"
+
+#: dirmngr/crlcache.c:2235
+msgid ""
+"updating the DIR file failed - cache entry will get lost with the next "
+"program start\n"
+msgstr ""
+"updating the DIR file failed - cache entry will get lost with the next "
+"program start\n"
+
+#: dirmngr/crlcache.c:2272
+#, c-format
+msgid "Begin CRL dump (retrieved via %s)\n"
+msgstr "Begin CRL dump (retrieved via %s)\n"
+
+#: dirmngr/crlcache.c:2295
+msgid ""
+" ERROR: The CRL will not be used because it was still too old after an "
+"update!\n"
+msgstr ""
+" ERROR: The CRL will not be used because it was still too old after an "
+"update!\n"
+
+#: dirmngr/crlcache.c:2298
+msgid ""
+" ERROR: The CRL will not be used due to an unknown critical extension!\n"
+msgstr ""
+" ERROR: The CRL will not be used due to an unknown critical extension!\n"
+
+#: dirmngr/crlcache.c:2301
+msgid " ERROR: The CRL will not be used\n"
+msgstr " ERROR: The CRL will not be used\n"
+
+#: dirmngr/crlcache.c:2308
+msgid " ERROR: This cached CRL may have been tampered with!\n"
+msgstr " ERROR: This cached CRL may have been tampered with!\n"
+
+#: dirmngr/crlcache.c:2326
+msgid " WARNING: invalid cache record length\n"
+msgstr " WARNING: invalid cache record length\n"
+
+#: dirmngr/crlcache.c:2333
+#, c-format
+msgid "problem reading cache record: %s\n"
+msgstr "problem reading cache record: %s\n"
+
+#: dirmngr/crlcache.c:2344
+#, c-format
+msgid "problem reading cache key: %s\n"
+msgstr "problem reading cache key: %s\n"
+
+#: dirmngr/crlcache.c:2375
+#, c-format
+msgid "error reading cache entry from db: %s\n"
+msgstr "error reading cache entry from db: %s\n"
+
+#: dirmngr/crlcache.c:2378
+msgid "End CRL dump\n"
+msgstr "End CRL dump\n"
+
+#: dirmngr/crlcache.c:2499
+#, c-format
+msgid "crl_fetch via DP failed: %s\n"
+msgstr "crl_fetch via DP failed: %s\n"
+
+#: dirmngr/crlcache.c:2510
+#, c-format
+msgid "crl_cache_insert via DP failed: %s\n"
+msgstr "crl_cache_insert via DP failed: %s\n"
+
+#: dirmngr/crlcache.c:2570
+#, c-format
+msgid "crl_cache_insert via issuer failed: %s\n"
+msgstr "crl_cache_insert via issuer failed: %s\n"
+
+#: dirmngr/crlfetch.c:74
+msgid "reader to file mapping table full - waiting\n"
+msgstr "reader to file mapping table full - waiting\n"
+
+#: dirmngr/crlfetch.c:182
+msgid "using \"http\" instead of \"https\"\n"
+msgstr "using “http” instead of “https”\n"
+
+#: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
+#: dirmngr/crlfetch.c:359
+#, c-format
+msgid "CRL access not possible due to disabled %s\n"
+msgstr "CRL access not possible due to disabled %s\n"
+
+#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
+#: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
+#, c-format
+msgid "error initializing reader object: %s\n"
+msgstr "error initializing reader object: %s\n"
+
+#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
+
+#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
+msgid "too many redirections\n"
+msgstr "too many redirections\n"
+
+#: dirmngr/crlfetch.c:274
+#, c-format
+msgid "error retrieving '%s': %s\n"
+msgstr "error retrieving '%s': %s\n"
+
+#: dirmngr/crlfetch.c:279
+#, c-format
+msgid "error retrieving '%s': http status %u\n"
+msgstr "error retrieving '%s': http status %u\n"
+
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
+msgid "CRL access not possible due to Tor mode\n"
+msgstr "CRL access not possible due to Tor mode\n"
+
+#: dirmngr/crlfetch.c:386
+#, c-format
+msgid "certificate search not possible due to disabled %s\n"
+msgstr "certificate search not possible due to disabled %s\n"
+
+#: dirmngr/dirmngr-client.c:71
+msgid "use OCSP instead of CRLs"
+msgstr "use OCSP instead of CRLs"
+
+#: dirmngr/dirmngr-client.c:72
+msgid "check whether a dirmngr is running"
+msgstr "check whether a dirmngr is running"
+
+#: dirmngr/dirmngr-client.c:73
+msgid "add a certificate to the cache"
+msgstr "add a certificate to the cache"
+
+#: dirmngr/dirmngr-client.c:74
+msgid "validate a certificate"
+msgstr "validate a certificate"
+
+#: dirmngr/dirmngr-client.c:75
+msgid "lookup a certificate"
+msgstr "lookup a certificate"
+
+#: dirmngr/dirmngr-client.c:76
+msgid "lookup only locally stored certificates"
+msgstr "lookup only locally stored certificates"
+
+#: dirmngr/dirmngr-client.c:77
+msgid "expect an URL for --lookup"
+msgstr "expect an URL for --lookup"
+
+#: dirmngr/dirmngr-client.c:78
+msgid "load a CRL into the dirmngr"
+msgstr "load a CRL into the dirmngr"
+
+#: dirmngr/dirmngr-client.c:79
+msgid "special mode for use by Squid"
+msgstr "special mode for use by Squid"
+
+#: dirmngr/dirmngr-client.c:80
+msgid "expect certificates in PEM format"
+msgstr "expect certificates in PEM format"
+
+#: dirmngr/dirmngr-client.c:82
+msgid "force the use of the default OCSP responder"
+msgstr "force the use of the default OCSP responder"
+
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
+msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+
- #: dirmngr/dirmngr-client.c:154
++#: dirmngr/dirmngr-client.c:173
+msgid ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+msgstr ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
+#, c-format
+msgid "error reading certificate from stdin: %s\n"
+msgstr "error reading certificate from stdin: %s\n"
+
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
+#, c-format
+msgid "error reading certificate from '%s': %s\n"
+msgstr "error reading certificate from '%s': %s\n"
+
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
+msgid "certificate too large to make any sense\n"
+msgstr "certificate too large to make any sense\n"
+
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
+#, 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
++#: dirmngr/dirmngr-client.c:333
+#, c-format
+msgid "lookup failed: %s\n"
+msgstr "lookup failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
+#, c-format
+msgid "loading CRL '%s' failed: %s\n"
+msgstr "loading CRL ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
+msgid "a dirmngr daemon is up and running\n"
+msgstr "a dirmngr daemon is up and running\n"
+
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
+#, c-format
+msgid "validation of certificate failed: %s\n"
+msgstr "validation of certificate failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
+msgid "certificate is valid\n"
+msgstr "certificate is valid\n"
+
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
+msgid "certificate has been revoked\n"
+msgstr "certificate has been revoked\n"
+
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
+#, c-format
+msgid "certificate check failed: %s\n"
+msgstr "certificate check failed: %s\n"
+
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
+#, c-format
+msgid "got status: '%s'\n"
+msgstr "got status: ‘%s’\n"
+
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
+#, c-format
+msgid "error writing base64 encoding: %s\n"
+msgstr "error writing base64 encoding: %s\n"
+
- #: dirmngr/dirmngr-client.c:685
++#: dirmngr/dirmngr-client.c:702
+#, c-format
+msgid "unsupported inquiry '%s'\n"
+msgstr "unsupported inquiry ‘%s’\n"
+
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
+msgid "absolute file name expected\n"
+msgstr "absolute file name expected\n"
+
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
+#, c-format
+msgid "looking up '%s'\n"
+msgstr "looking up ‘%s’\n"
+
+#: dirmngr/dirmngr.c:159
+msgid "run as windows service (background)"
+msgstr "run as windows service (background)"
+
+#: dirmngr/dirmngr.c:161
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
+#: dirmngr/dirmngr.c:162
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
+#: dirmngr/dirmngr.c:163
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
+#: dirmngr/dirmngr.c:164
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
+#: dirmngr/dirmngr.c:165
+msgid "flush the cache"
+msgstr "flush the cache"
+
+#: dirmngr/dirmngr.c:180 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
+#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
+#: dirmngr/dirmngr.c:181
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
+#: dirmngr/dirmngr.c:182
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
+#: dirmngr/dirmngr.c:183
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
+#: dirmngr/dirmngr.c:184
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
+#: dirmngr/dirmngr.c:185
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
+#: dirmngr/dirmngr.c:187
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
+#: dirmngr/dirmngr.c:189
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
+#: dirmngr/dirmngr.c:191
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
+#: dirmngr/dirmngr.c:194
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
+#: dirmngr/dirmngr.c:196
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
+#: 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:201
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
+#: 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: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:209
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
+#: dirmngr/dirmngr.c:211
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
+#: 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: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:224
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
+
+#: 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:353
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
+#: 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:435
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr "valid debug levels are: %s\n"
+
+#: 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:1124
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘%s’ failed: %s\n"
+
+#: 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:1646 dirmngr/dirmngr.c:1730
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
+#: 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: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:1804
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
+#: dirmngr/dirmngr.c:1831
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
+#: dirmngr/dirmngr.c:1836 dirmngr/dirmngr.c:1927
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
+#: 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:1843 dirmngr/dirmngr.c:1930
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
+#: dirmngr/dirmngr.c:1851
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
+#: 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:502
+#, c-format
+msgid "malloc failed: %s\n"
+msgstr "malloc failed: %s\n"
+
+#: dirmngr/ldap.c:627
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
+
+#: dirmngr/ldap.c:840
+msgid "ldap_search hit the size limit of the server\n"
+msgstr "ldap_search hit the size limit of the server\n"
+
+#: dirmngr/misc.c:170
+msgid "invalid canonical S-expression found\n"
+msgstr "invalid canonical S-expression found\n"
+
+#: dirmngr/misc.c:194 dirmngr/misc.c:228
+#, c-format
+msgid "gcry_md_open failed: %s\n"
+msgstr "gcry_md_open failed: %s\n"
+
+#: dirmngr/misc.c:199 dirmngr/misc.c:233
+#, c-format
+msgid "oops: ksba_cert_hash failed: %s\n"
+msgstr "oops: ksba_cert_hash failed: %s\n"
+
+#: dirmngr/misc.c:518
+msgid "bad URL encoding detected\n"
+msgstr "bad URL encoding detected\n"
+
+#: dirmngr/ocsp.c:80
+#, c-format
+msgid "error reading from responder: %s\n"
+msgstr "error reading from responder: %s\n"
+
+#: dirmngr/ocsp.c:98
+#, c-format
+msgid "response from server too large; limit is %d bytes\n"
+msgstr "response from server too large; limit is %d bytes\n"
+
+#: dirmngr/ocsp.c:139
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "OCSP request not possible due to Tor mode\n"
+
+#: dirmngr/ocsp.c:145
+msgid "OCSP request not possible due to disabled HTTP\n"
+msgstr "OCSP request not possible due to disabled HTTP\n"
+
+#: dirmngr/ocsp.c:152
+#, c-format
+msgid "error setting OCSP target: %s\n"
+msgstr "error setting OCSP target: %s\n"
+
+#: dirmngr/ocsp.c:170
+#, c-format
+msgid "error building OCSP request: %s\n"
+msgstr "error building OCSP request: %s\n"
+
+#: dirmngr/ocsp.c:181
+#, c-format
+msgid "error connecting to '%s': %s\n"
+msgstr "error connecting to '%s': %s\n"
+
+#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
+#, c-format
+msgid "error reading HTTP response for '%s': %s\n"
+msgstr "error reading HTTP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:240
+#, c-format
+msgid "error accessing '%s': http status %u\n"
+msgstr "error accessing '%s': http status %u\n"
+
+#: dirmngr/ocsp.c:265
+#, c-format
+msgid "error parsing OCSP response for '%s': %s\n"
+msgstr "error parsing OCSP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
+#, c-format
+msgid "OCSP responder at '%s' status: %s\n"
+msgstr "OCSP responder at ‘%s’ status: %s\n"
+
+#: dirmngr/ocsp.c:293
+#, c-format
+msgid "hashing the OCSP response for '%s' failed: %s\n"
+msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
+
+#: dirmngr/ocsp.c:328
+msgid "not signed by a default OCSP signer's certificate"
+msgstr "not signed by a default OCSP signer's certificate"
+
+#: dirmngr/ocsp.c:417
+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:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2438
++#: dirmngr/server.c:2437
+#, 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:2478
++#: dirmngr/server.c:2477
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
+#, 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:608 tools/gpgconf-comp.c:683
+#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
+#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
+#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
+#: tools/gpgconf-comp.c:528
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
+#: tools/gpgconf-comp.c:532
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:536
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:560
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
+#: tools/gpgconf-comp.c:563
+msgid "do not allow to bypass the passphrase policy"
+msgstr "do not allow to bypass the passphrase policy"
+
+#: tools/gpgconf-comp.c:567
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|set minimal required length for new passphrases to N"
+
+#: tools/gpgconf-comp.c:571
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|require at least N non-alpha characters for a new passphrase"
+
+#: tools/gpgconf-comp.c:575
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
+#: tools/gpgconf-comp.c:579
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
+#: tools/gpgconf-comp.c:583
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
+#: tools/gpgconf-comp.c:587
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
+
+#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: tools/gpgconf-comp.c:704
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: tools/gpgconf-comp.c:735
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
+#: tools/gpgconf-comp.c:738
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
+#: tools/gpgconf-comp.c:787
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
+#: tools/gpgconf-comp.c:790
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: tools/gpgconf-comp.c:820
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: tools/gpgconf-comp.c:869
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
+#: tools/gpgconf-comp.c:905
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
+#: tools/gpgconf-comp.c:915
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
+#: tools/gpgconf-comp.c:929
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
+#: tools/gpgconf-comp.c:940
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: tools/gpgconf-comp.c:945
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: tools/gpgconf-comp.c:974
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
+#: tools/gpgconf-comp.c:982
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: tools/gpgconf-comp.c:1063
+msgid "GPG for OpenPGP"
+msgstr "GPG for OpenPGP"
+
+#: tools/gpgconf-comp.c:1064
+msgid "GPG Agent"
+msgstr "GPG Agent"
+
+#: tools/gpgconf-comp.c:1065
+msgid "Smartcard Daemon"
+msgstr "Smartcard Daemon"
+
+#: tools/gpgconf-comp.c:1066
+msgid "GPG for S/MIME"
+msgstr "GPG for S/MIME"
+
+#: tools/gpgconf-comp.c:1067
+msgid "Key Acquirer"
+msgstr "Key Acquirer"
+
+#: tools/gpgconf-comp.c:1068
+msgid "PIN and Passphrase Entry"
+msgstr "PIN and Passphrase Entry"
+
+#: tools/gpgconf-comp.c:1182
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
+#: tools/gpgconf-comp.c:3240
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
+#: tools/gpgconf-comp.c:3391
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
+#: tools/gpgconf.c: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.po
index a22a043,43b29a8..a9b01da
--- a/po/eo.po
+++ b/po/eo.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
"Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@@ -101,8 -85,6 +101,8 @@@ msgstr "Bonvolu doni la pasfrazon; tio
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "malbona pasfrazo"
@@@ -158,25 -129,11 +158,25 @@@ msgstr "malbona pasfrazo
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -386,8 -304,6 +386,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "�an�i la pasfrazon"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -397,118 -313,87 +397,118 @@@ msgstr "
"Opcioj:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detala eligo"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "ser�i �losilojn �e �losilservilo"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualigi la fido-datenaron"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ne realigita"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -517,162 -402,122 +517,167 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: dosierujo kreita\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu �losiloj ignoritaj\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -688,8 -531,6 +693,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -697,9 -538,6 +702,9 @@@ msgstr "
"@Komandoj:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -709,46 -547,38 +714,46 @@@ msgstr "
"Opcioj:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "nuligita de uzanto\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -812,8 -632,6 +817,8 @@@ msgstr "
msgid "Yes"
msgstr "jes"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -843,46 -658,38 +848,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "�an�i la pasfrazon"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "�alti �losilon"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -923,53 -723,42 +928,57 @@@ msgstr "protekto-metodo %d%s ne estas r
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eraro dum legado de '%s': %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "aktualigo malsukcesis: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -984,17 -771,18 +993,22 @@@ msgstr "komunikproblemo kun gpg-agent\n
msgid "problem setting the gpg-agent options\n"
msgstr "problemo kun agento: agento redonas 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "nuligita de uzanto\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "problemo kun agento: agento redonas 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problemo kun agento: agento redonas 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
@@@ -1066,17 -840,18 +1080,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, fuzzy, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1408,7 -1116,6 +1427,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "ne traktita"
@@@ -1418,22 -1124,14 +1437,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "nevalida kiraso"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "vi trovis cimon ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "ne povas malfermi %s: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
@@@ -1472,89 -1163,75 +1486,95 @@@ msgstr "publika �losilo %08lX ne trovit
msgid "waiting for lock %s...\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "kiraso: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "nevalida kiraso�apo: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "kiraso�apo: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "nevalida �apo de klarteksta subskribo\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "kiraso�apo: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "ingitaj klartekstaj subskriboj\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "neatendita kiraso:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "nevalida strek-eskapita linio: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "nevalida signo %02x en bazo 64 ignorita\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "tro frua dosierfino (nenia CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "tro frua dosierfino (en CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "misformita CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-eraro; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "tro frua dosierfino (en vosto)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "eraro en vostolinio\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
"uzata\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "ne homlegebla"
+
++#: g10/build-packet.c:1143
#, fuzzy
msgid ""
"a notation name must have only printable characters or spaces, and end with "
@@@ -1563,85 -1240,71 +1583,93 @@@ msgstr "
"notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
"kaj fini per '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
#, fuzzy
msgid "a user notation name must contain the '@' character\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
+ "kaj fini per '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "AVERTO: nevalida notacia dateno trovita\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "ne homlegebla"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, fuzzy, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Donu pasfrazon: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "AVERTO: %s nuligas %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "sekreta �losilo ne havebla"
- #: g10/card-util.c:92 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "ne povas fari tion en neinteraga re�imo\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Via elekto? "
@@@ -1708,21 -1357,11 +1736,16 @@@ msgstr "skribas publikan �losilon al '%
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
@@@ -1820,13 -1440,10 +1843,13 @@@ msgstr "Kiun �losilgrandon vi deziras?
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rondigita �is %u bitoj\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1881,9 -1488,6 +1904,9 @@@ msgstr " (%d) RSA (nur �ifri)\n
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Nevalida elekto.\n"
@@@ -1917,7 -1515,6 +1940,7 @@@ msgstr "�u vere subskribi?
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "forlasi �i tiun menuon"
@@@ -1926,7 -1522,6 +1949,7 @@@
msgid "show admin commands"
msgstr "malkongruaj komandoj\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "montri �i tiun helpon"
@@@ -2010,168 -1587,131 +2033,168 @@@ msgstr "malkongruaj komandoj\n
msgid "Admin commands are not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Nevalida komando (provu per \"helpo\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "ne povas malfermi '%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eraro dum legado de �losilbloko: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/delkey.c:130 g10/delkey.c:137
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr ""
- #: g10/delkey.c:136
++#: g10/delkey.c:135
#, 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:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "�losilo"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
msgid "subkey"
msgstr "al"
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr ""
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "'%s' jam densigita\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "legas el '%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, 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"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, fuzzy, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s-�ifrita por: %s\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, 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"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s-�ifritaj datenoj\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "�ifrita per nekonata metodo %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problemo �e traktado de �ifrita paketo\n"
@@@ -2227,137 -1756,109 +2250,137 @@@ 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:79
++#: g10/export.c:78
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "neuzebla sekreta �losilo"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ignorita: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "AVERTO: nenio estis eksportita\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[Uzantidentigilo ne trovita]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "nevalida kiraso"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "Fingrospuro:"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "fari apartan subskribon"
@@@ -2367,11 -1867,9 +2390,11 @@@
msgid "make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "�ifri datenojn"
@@@ -2379,15 -1876,12 +2402,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "�ifri nur kun simetria �ifro"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "mal�ifri datenojn (implicita elekto)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "kontroli subskribon"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "listigi �losilojn"
@@@ -2400,15 -1892,12 +2423,15 @@@ msgstr "listigi �losilojn kaj subskribo
msgid "list and check key signatures"
msgstr "kontroli �losilsubskribojn"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "listigi �losilojn kaj fingro�purojn"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "listigi sekretajn �losilojn"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "krei novan �losilparon"
@@@ -2432,7 -1917,6 +2455,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "forigi �losilojn de la publika �losilaro"
@@@ -2464,7 -1942,6 +2487,7 @@@ msgstr "subskribi �losilon loke
msgid "sign or edit a key"
msgstr "subskribi a� redakti �losilon"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "�an�i la pasfrazon"
@@@ -2514,24 -1980,19 +2537,24 @@@ msgstr "aktualigi la fido-datenaron
msgid "print message digests"
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOMO|�ifri por NOMO"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
@@@ -2545,12 -2004,10 +2568,12 @@@ msgstr "|N|difini densig-nivelon N (0=n
msgid "use canonical text mode"
msgstr "uzi tekstan re�imon"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "fari neniajn �an�ojn"
@@@ -2562,7 -2017,6 +2585,7 @@@ msgstr "
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2570,7 -2024,6 +2593,7 @@@ msgstr "
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2590,13 -2043,11 +2613,13 @@@ msgstr "
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2611,7 -2062,6 +2634,7 @@@ msgstr "
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2619,607 -2069,478 +2642,607 @@@ msgstr "
"\n"
"Realigitaj metodoj:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr ""
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr ""
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr ""
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
#, fuzzy
msgid "Compression: "
msgstr "Komento: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uzado: gpg [opcioj] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr ""
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1537
#, 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:1537
++#: g10/gpg.c:1540
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1546
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1549
#, 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:1549
++#: g10/gpg.c:1552
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "montri, en kiu �losilaro estas listigita �losilo"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "mal�alti �losilon"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, fuzzy, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
- #: g10/gpg.c:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
#, fuzzy
msgid "invalid import options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
#, fuzzy
msgid "invalid export options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTO: %s nuligas %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
#, 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:3517
++#: g10/gpg.c:3524
#, 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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
#, fuzzy
msgid "invalid default preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
- #: g10/gpg.c:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [dosiero]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [dosiero]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key uzantidentigilo"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
msgid "export as ssh key failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record malsukcesis: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[dosiero]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "la donita gvidlinia URL por atestado ne validas\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@@ -3234,7 -2553,6 +3257,7 @@@ msgstr "�u forvi�i �i tiun �losilon de
msgid "make timestamp conflicts only a warning"
msgstr "malkongruo de tempostampoj"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
@@@ -3259,326 -2573,260 +3282,326 @@@ msgstr "Nenia helpo disponata
msgid "No help available for '%s'"
msgstr "Nenia helpo disponata por '%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aktualigi la fido-datenaron"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aktualigi la fido-datenaron"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "neuzebla sekreta �losilo"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignoras blokon de speco %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu �losiloj jam traktitaj\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Nombro traktita entute: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ignoritaj novaj �losiloj: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignoritaj novaj �losiloj: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sen uzantidentigilo: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importitaj: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " ne�an�itaj: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novaj uzantidentigiloj: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novaj sub�losiloj: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " novaj subskriboj: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novaj �losilrevokoj: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " sekretaj �losiloj legitaj: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "sekretaj �losiloj importitaj: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, fuzzy, c-format
msgid " not imported: %lu\n"
msgstr " importitaj: %lu"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novaj subskriboj: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " sekretaj �losiloj legitaj: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ignoris '%s': %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "�losilo %08lX: nova �losilo - ignorita\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "neniu skribebla �losilaro trovita: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "�losilo %08lX: publika �losilo importita\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "�losilo %08lX: diferencas de nia kopio\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "�losilo %08lX: 1 nova subskribo\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "�losilo %08lX: 1 nova sub�losilo\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "�losilo %08lX: ne �an�ita\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "�losilo %08lX: sekreta �losilo importita\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@@ -3593,196 -2841,174 +3616,216 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "�losilo %08lX: revokatestilo importita\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
- #: g10/import.c:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:2122
++#: g10/import.c:2121
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "�losilo %08lX: ignoris uzantidentigilon '"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "�losilo %08lX: ignoris sub�losilon\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
- #: g10/import.c:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "�losilaro '%s' kreita\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "�losilaro '%s' kreita\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revoko]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[mem-subskribo]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d malbonaj subskriboj\n"
- msgstr[1] "%d malbonaj subskriboj\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "%s-subskribo de: %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "Bona subskribo de \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "ignoris '%s': %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
+ msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3790,23 -3016,25 +3833,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 subskribo ne kontrolita pro manko de �losilo\n"
msgstr[1] "1 subskribo ne kontrolita pro manko de �losilo\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 subskribo ne kontrolita pro eraro\n"
- msgstr[1] "1 subskribo ne kontrolita pro eraro\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d malbonaj subskriboj\n"
+ msgstr[1] "%d malbonaj subskriboj\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
- msgstr[1] "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Bona subskribo de \""
+ msgstr[1] "Bona subskribo de \""
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3819,69 -3047,54 +3868,69 @@@ msgstr "
"kontrolante fingrospurojn el diversaj fontoj ...)?\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Mi fidas iomete\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Mi plene fidas\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, fuzzy, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
#, 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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr ""
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "�u vere subskribi? "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, fuzzy, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3892,7 -3105,6 +3941,7 @@@ msgstr "
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
#, fuzzy
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
@@@ -3901,7 -3113,6 +3950,7 @@@
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:773
++#: g10/keyedit.c:1286
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3912,12 -3123,10 +3961,12 @@@ msgstr "
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
#, 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:799
++#: g10/keyedit.c:1312
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3928,7 -3137,6 +3977,7 @@@ msgstr "
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
#, fuzzy
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
@@@ -3937,41 -3145,33 +3986,41 @@@
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
#, 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:855
++#: g10/keyedit.c:1368
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nenio por subskribi per �losilo %08lX\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "�i tiu �losilo eksvalidi�is!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
#, 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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3980,32 -3180,26 +4029,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:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Mi ne respondas.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Mi tute ne kontrolis.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Mi malzorge kontrolis.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Mi tre zorge kontrolis.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr " i = bonvolu montri pli da informoj\n"
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4014,268 -3208,210 +4063,264 @@@ msgstr "
"�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
"per via �losilo: \""
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, 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:1010
++#: g10/keyedit.c:1523
#, 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:1020
++#: g10/keyedit.c:1533
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel neeksportebla.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Mi tute ne kontrolis �i tiun �losilon.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Mi malzorge kontrolis �i tiun �losilon.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Mi tre zorge kontrolis �i tiun �losilon.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "�u vere subskribi? "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "movas �losilsubskribon al la �usta loko\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "skribi kaj fini"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "montri fingrospuron"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Subskribo-notacio: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "listigi �losilojn kaj uzantidentigilojn"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "elekti uzantidentigilon N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "elekti uzantidentigilon N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "revoki subskribojn"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "subskribi la �losilon loke"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "aldoni uzantidentigilon"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "aldoni foto-identigilon"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "forvi�i uzantidentigilon"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "al"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "forvi�i flankan �losilon"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
#, fuzzy
msgid "add a revocation key"
msgstr "aldoni flankan �losilon"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
#, 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:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marku uzantidentigilon kiel �efan"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "listigi preferojn (spertula)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "listigi preferojn (detale)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "�an�i la pasfrazon"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "�an�i la posedantofidon"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "aldoni uzantidentigilon"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoki flankan �losilon"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "�alti �losilon"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "mal�alti �losilon"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "montri foto-identigilon"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Sekreta �losilo estas havebla.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Bezonas la sekretan �losilon por fari tion.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4283,302 -3419,242 +4328,308 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
#, fuzzy
msgid "Key is revoked."
msgstr "�losilo estas revokita.\n"
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "�u vere subskribi �iujn uzantidentigilojn? "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "�u vere subskribi �iujn uzantidentigilojn? "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "nekonata klaso de subskribo"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Vi devas elekti almena� unu �losilon.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Vi devas elekti almena� unu �losilon.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, 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:2031
++#: g10/keyedit.c:2497
#, 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:2069
++#: g10/keyedit.c:2535
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, 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:2099
++#: g10/keyedit.c:2565
#, 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:2101
++#: g10/keyedit.c:2567
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "�u vi vere volas revoki �i tiun �losilon? "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "agordi liston de preferoj"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, 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:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "�u vere aktualigi la preferojn? "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "�u skribi �an�ojn? "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "�u fini sen skribi �an�ojn? "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "nevalida valoro\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Uzantidentigilo ne ekzistas.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nenio por subskribi per �losilo %08lX\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr ""
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr ""
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Notacio: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
- #: g10/keyedit.c:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr " (sentema)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "ne povas krei %s: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "rev"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [eksvalidi�os: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [eksvalidi�os: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, fuzzy, c-format
msgid "usage: %s"
msgstr " fido: %c/%c"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " fido: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "�i tiu �losilo estas mal�altita"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "rev"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "eksval"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4587,36 -3663,28 +4638,36 @@@ msgstr "
"AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
" ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
#, 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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4624,37 -3692,30 +4675,37 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Forvi�is %d subskribon.\n"
msgstr[1] "Forvi�is %d subskribon.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Nenio estis forvi�ita.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "nevalida"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
#, fuzzy
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
@@@ -4664,278 -3725,220 +4715,278 @@@ 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:3863
++#: g10/keyedit.c:4382
#, 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:3880
++#: g10/keyedit.c:4399
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Donu la �losilgrandon"
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3920
++#: g10/keyedit.c:4439
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3942
++#: g10/keyedit.c:4461
#, 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:3961
++#: g10/keyedit.c:4479
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
- #: g10/keyedit.c:3967
++#: g10/keyedit.c:4485
#, 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:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
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:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
- #: g10/keyedit.c:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, 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:4557
++#: g10/keyedit.c:5181
#, 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:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Subskribo-notacio: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "�u surskribi (j/N)? "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "uzantidentigilo: \""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr ""
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
#, 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:5178
++#: g10/keyedit.c:5802
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
#, fuzzy
msgid "Not signed by you.\n"
msgstr " subskribita per %08lX je %s%s\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr "subskribi �losilon nerevokeble"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revokita de %08lX je %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Vi revokos la sekvajn subskribojn:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "�u vere krei la revokatestilojn? (j/N)"
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "mankas sekreta �losilo\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
- #: g10/keyedit.c:5509
++#: g10/keyedit.c:6133
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "prefero %c%lu ripetita\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "tro da '%c'-preferoj\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "tro da '%c'-preferoj\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "tro da '%c'-preferoj\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "nevalida signo en signo�eno\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
#, fuzzy
msgid "writing direct signature\n"
msgstr "skribas mem-subskribon\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "skribas mem-subskribon\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "skribas �losilbindan subskribon\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "�losilgrando nevalida; uzas %u bitojn\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "�losilgrando rondigita �is %u bitoj\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "subskribi"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "�ifri datenojn"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -4949,157 -3952,126 +5000,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (nur �ifri)\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur subskribi)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (nur subskribi)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur �ifri)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (nur �ifri)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (nur �ifri)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (nur �ifri)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (nur subskribi)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (nur �ifri)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (nur �ifri)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (nur �ifri)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Subskribo-notacio: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Petita �losilgrando estas %u bitoj\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "rondigita �is %u bitoj\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5115,7 -4087,6 +5166,7 @@@ msgstr "
" <n>m = �losilo eksvalidi�os post n monatoj\n"
" <n>y = �losilo eksvalidi�os post n jaroj\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5131,40 -4102,32 +5182,40 @@@ msgstr "
" <n>m = �losilo eksvalidi�os post n monatoj\n"
" <n>y = �losilo eksvalidi�os post n jaroj\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "�losilo validu ...? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "�losilo validu por ...? (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "nevalida valoro\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s neniam eksvalidi�os\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s neniam eksvalidi�os\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s eksvalidi�os je %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5172,12 -4135,10 +5223,12 @@@ msgstr "
"Via sistemo ne povas montri datojn post 2038.\n"
"Tamen, �i estos �uste traktata �is 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "�u tio estas �usta (j/n)? "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5188,7 -4149,6 +5239,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5204,50 -4164,39 +5255,50 @@@ msgstr "
" \"Heinrich Heine (la poeto) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Vera nomo: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komenci�i per cifero\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almena� 5 signojn\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Retadreso: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Komento: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5258,7 -4207,6 +5309,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5273,35 -4221,28 +5324,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Bonvolu korekti la eraron unue\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5313,12 -4254,10 +5364,12 @@@ msgstr "
"kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
"akiri sufi�e da entropio.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5326,66 -4265,53 +5377,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "'%s' jam densigita\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "�u tamen uzi �i tiun �losilon? "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
msgid "creating anyway\n"
msgstr "�u tamen uzi �i tiun �losilon? "
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Kreado de �losiloj nuligita.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "neniu skribebla publika �losilaro trovita: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5394,7 -4320,6 +5445,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:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5402,7 -4327,6 +5453,7 @@@ msgstr "
"�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
"horlo�eraro)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5410,53 -4334,42 +5461,53 @@@ msgstr "
"�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
"horlo�eraro)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
#, 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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "�u vere krei? "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr ""
- #: g10/keylist.c:331
++#: g10/keylist.c:330
#, fuzzy
msgid "Critical signature policy: "
msgstr "Subskribo-gvidlinioj: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Subskribo-gvidlinioj: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
#, fuzzy
msgid "Critical signature notation: "
msgstr "Subskribo-notacio: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Subskribo-notacio: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5464,66 -4377,61 +5515,74 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d malbonaj subskriboj\n"
msgstr[1] "%d malbonaj subskriboj\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 subskribo ne kontrolita pro eraro\n"
+ msgstr[1] "1 subskribo ne kontrolita pro eraro\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "�losilaro"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ignoris '%s': %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "listigi �losilojn kaj fingro�purojn"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
#, 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:1898
++#: g10/keylist.c:1919
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " �losilo-fingrospuro ="
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " �losilo-fingrospuro ="
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " �losilo-fingrospuro ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrolas �losilaron '%s'\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
msgstr[1] "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5531,7 -4439,6 +5590,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu �losiloj aktualigitaj\n"
msgstr[1] "\t%lu �losiloj aktualigitaj\n"
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5539,524 -4446,417 +5598,524 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 malbona subskribo\n"
msgstr[1] "1 malbona subskribo\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: �losilaro kreita\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "el"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "nevalida �losilaro"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: ne valida �losilidentigilo\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
msgstr[1] "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "nevalida �losilaro"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"subskribita per via �losilo %08lX je %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr ""
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, fuzzy, c-format
msgid "%s encrypted session key\n"
msgstr "%s-�ifritaj datenoj\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "�ifrita per nekonata metodo %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "publika �losilo estas %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alinome \""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "�ifrita per %s-�losilo, %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, fuzzy, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "Ripetu pasfrazon\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
#, fuzzy
msgid "encrypted with 1 passphrase\n"
msgstr "Ripetu pasfrazon\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "supozas %s �ifritajn datenojn\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "�ifro IDEA ne disponata, optimisme provas uzi %s anstata�e\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
#, fuzzy
msgid "WARNING: message was not integrity protected\n"
msgstr "AVERTO: nenio estis eksportita\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "mal�ifrado sukcesis\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "originala dosiernomo='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "Bona subskribo de \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "MALBONA subskribo de \""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Eksvalidi�inta subskribo de \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Bona subskribo de \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "kontrolo de subskribo estas mal�altita\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alinome \""
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
#, fuzzy
msgid "Key available at: "
msgstr "Nenia helpo disponata"
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[malcerta]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alinome \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
#, fuzzy
msgid "binary"
msgstr "�efa"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr ""
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
#, fuzzy
msgid "unknown"
msgstr "nekonata versio"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "nekonata publik�losila metodo"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Ne povas kontroli subskribon: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "ne aparta subskribo\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "memstara subskribo de klaso 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "malnovstila subskribo (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "ne povas trakti publik�losilan metodon %d\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "nerealigita �ifrad-metodo"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, fuzzy, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/misc.c:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "kiraso: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "kiraso: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, fuzzy, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
#, fuzzy
msgid "Uncompressed"
msgstr "ne traktita"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "ne traktita"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "legas opciojn el '%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "nekonata klaso de subskribo"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Dosiero '%s' ekzistas. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "�u surskribi (j/N)? "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: nekonata sufikso\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Donu novan dosiernomon"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "skribas al la normala eligo\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "supozas subskribitajn datenojn en '%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
msgid "new configuration file '%s' created\n"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr ""
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ne povas trakti publik�losilan metodon %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problemo kun agento: agento redonas 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (�ef�losilo %08lX)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6069,15 -4869,12 +6128,15 @@@ msgstr "
"\"%.*s\"\n"
"%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Donu pasfrazon\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "nuligita de uzanto\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6087,47 -4884,38 +6146,47 @@@ msgstr "
"Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
"por la uzanto: \""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6180,32 -4960,25 +6239,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Nenia kialo specifita"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "�losilo estas anstata�igita."
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "�losilo estas kompromitita"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "�losilo estas ne plu uzata"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "Uzantidentigilo ne plu validas"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
#, fuzzy
msgid "reason for revocation: "
msgstr "Kialo por revoko: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
#, fuzzy
msgid "revocation comment: "
msgstr "Komento pri revoko: "
@@@ -6220,100 -4993,81 +6279,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMfFsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Nenia fidovaloro atribuita al:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " alinome \""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, 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:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Ne scias\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Ni NE fidas �i tiun �losilon\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Mi fidas absolute\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = reen al la �efmenuo\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = supersalti �i tiun �losilon\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " f = fini\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Via decido? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, 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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Atestiloj, kiuj kondukas al absolute fidata �losilo:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
#, 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:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "�i tiu �losilo apartenas al ni\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6325,132 -5079,104 +6384,132 @@@ msgstr "
"la sekva demando per \"jes\"\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "�u tamen uzi �i tiun �losilon? "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "AVERTO: Uzas nefidatan �losilon!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
#, 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:547
++#: g10/pkclist.c:562
#, 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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Tio povas signifi, ke la subskribo estas falsa.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " La subskribo ver�ajne estas FALSA.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorita: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorita: publika �losilo jam �eestas\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "ne povas konekti�i al '%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6458,167 -5184,131 +6517,167 @@@ msgstr "
"\n"
"Donu la uzantidentigilon. Finu per malplena linio: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Uzantidentigilo ne ekzistas.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Publika �losilo estas mal�altita.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "ignorita: publika �losilo jam agordita\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "mankas validaj adresitoj\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Aparta subskribo.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Bonvolu doni la nomon de la dosiero: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "legas la normalan enigon ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "mankas subskribitaj datenoj\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "nenomita ricevonto; provas per sekreta �losilo %08lX ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "bone; ni estas la nenomita ricevonto.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "malnova kodado de DEK ne estas realigita\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "�ifrad-metodo %d%s estas nekonata a� mal�altita\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, fuzzy, c-format
msgid "build_packet failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr ""
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr ""
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "Sekreta �losilo estas havebla.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
#, 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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr ""
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, fuzzy, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "listigo de �losilblokoj malsukcesis: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
#, fuzzy
msgid "Revocation certificate created.\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6627,19 -5317,16 +6686,19 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "�losilo '%s' ne trovita: %s\n"
@@@ -6647,23 -5334,19 +6706,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6674,95 -5357,77 +6733,95 @@@
"your machine might store the data and make it available to others!\n"
msgstr ""
- #: g10/revoke.c:770
++#: g10/revoke.c:769
#, fuzzy
msgid "Please select the reason for the revocation:\n"
msgstr "Kialo por revoko: "
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr ""
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
- #: g10/revoke.c:823
++#: g10/revoke.c:822
#, 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:851
++#: g10/revoke.c:850
#, fuzzy, c-format
msgid "Reason for revocation: %s\n"
msgstr "Kialo por revoko: "
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr ""
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "�u tamen uzi �i tiun �losilon? "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "malforta �losilo kreita - provas denove\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr ""
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = bonvolu montri pli da informoj\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
- #: g10/sig-check.c:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
msgstr[1] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
msgstr[1] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6775,7 -5440,6 +6834,7 @@@ msgstr[1] "
"�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
"horlo�eraro)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6787,39 -5451,32 +6846,39 @@@ msgstr[1] "
"�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
"horlo�eraro)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "�losilo %08lX: �losilo estas revokita!\n"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, fuzzy, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
"kompletigo.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6827,7 -5484,6 +6886,7 @@@ msgstr "
"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
"kompletigo.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6836,393 -5492,317 +6895,393 @@@ msgstr "
"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
"kompletigo.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "subskribas:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s �ifrado estos aplikata\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
"stokastilo!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ignoris '%s': ripetita\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "ignorita: sekreta �losilo jam �eestas\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
"# (Use \"gpg --import-ownertrust\" to restore them)\n"
msgstr ""
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "pasfrazo estas tro longa\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr "importi posedantofido-valorojn"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "eraro dum legado de dosieruja registro: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "kiraso: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "fido-datenaro: sync malsukcesis: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "ne povas krei '%s': %s\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "ne povas malfermi '%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "fido-datenaro-transakcio tro granda\n"
- #: 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"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: dosierujo ne ekzistas!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, fuzzy, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "ne povas fermi '%s': %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: malsukcesis krei versiregistron: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: nevalida fido-datenaro kreita\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: fido-datenaro kreita\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
msgid "Note: trustdb not writable\n"
msgstr "sekretaj �losilpartoj ne estas disponataj\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: nevalida fido-datenaro\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: eraro dum aktualigo de versiregistro: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: eraro dum legado de versiregistro: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: eraro dum skribado de versiregistro: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "fido-datenaro: lseek malsukcesis: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ne estas fido-datenaro\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versiregistro kun registronumero %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: eraro dum legado de libera registro: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: malsukcesis nuligi registron: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: malsukcesis aldoni registron: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: fido-datenaro kreita\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "enigata linio pli longa ol %d signojn\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Realigitaj metodoj:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "publika �losilo %08lX ne trovita: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Gvidlinio: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "listigi �losilojn"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
msgstr[1] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7232,173 -5812,153 +7291,184 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "�losilo %08lX: akceptita kiel fidata �losilo\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "�losilo markita kiel absolute fidata.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7407,7 -5966,6 +7477,7 @@@
msgid "no need for a trustdb check\n"
msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "sekva kontrolo de fido-datenaro je %s\n"
@@@ -7454,34 -6004,27 +7524,34 @@@ msgstr "publika �losilo de absolute fid
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr ""
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7493,42 -6036,33 +7563,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "rev"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "eksval"
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "nekonata versio"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7538,12 -6072,10 +7608,12 @@@ msgstr "
"Bonvolu memori, ke la subskribodosiero (.sig a� .asc)\n"
"devas esti la unua dosiero donita en la komandlinio.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "enigata linio %u tro longa, a� mankas linifino\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "ne povas malfermi '%s': %s\n"
@@@ -7873,7 -6337,6 +7943,7 @@@ msgstr "Donu la uzantidentigilon:
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8018,9 -6451,6 +8088,9 @@@ msgstr "eraro dum kreado de pasfrazo: %
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@@ -8541,7 -6866,6 +8611,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "eraro dum legado de �losilbloko: %s\n"
@@@ -8566,134 -6886,104 +8636,134 @@@ msgstr "forvi�o de �losilbloko malsukce
msgid "no valid recipients given\n"
msgstr "nevalida respondo de agento\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "listigi sekretajn �losilojn"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "Valida atestilrevoko"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "Bona atestilo"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "Bona atestilo"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "krei eligon en askia kiraso"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "tute ne uzi la terminalon"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "neinteraga re�imo: neniam demandi"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "supozi \"jes\" �e la plej multaj demandoj"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "supozi \"ne\" �e la plej multaj demandoj"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMO|uzi �ifrad-metodon NOMO"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMO|uzi kompendi-metodon NOMO"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8704,47 -6994,38 +8774,47 @@@ msgstr "
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "ne povas konekti�i al '%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = supersalti �i tiun �losilon\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "skribas al '%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8762,7 -7040,6 +8832,7 @@@ msgstr "Bona atestilo
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -8777,32 -7052,26 +8847,32 @@@ msgstr "eraro dum kreado de pasfrazo: %
msgid "error reading input: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? problemo en kontrolo de revoko: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -8978,7 -7214,6 +9048,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
@@@ -8988,8 -7222,6 +9058,8 @@@
msgid "certificate cached\n"
msgstr "Valida atestilrevoko"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -9594,13 -7703,11 +9664,13 @@@ msgstr "Bona atestilo
msgid "force the use of the default OCSP responder"
msgstr "Donu la �losilgrandon"
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9608,85 -7715,69 +9678,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "Valida atestilrevoko"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "�losilo %08lX: �losilo estas revokita!\n"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Realigitaj metodoj:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9841,12 -7898,10 +9911,12 @@@ msgstr "uzado: gpg [opcioj]
msgid "colons are not allowed in the socket name\n"
msgstr "%s ne eblas kun %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
@@@ -10339,77 -8292,61 +10409,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
- #: dirmngr/server.c:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/es.po
index b81d922,09fc298..a3fb617
--- a/po/es.po
+++ b/po/es.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 2.0.9\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2015-10-09 17:10+0200\n"
"Last-Translator: Jaime Su�rez <jaime.suma at gmail.com>\n"
"Language-Team: Spanish <es at li.org>\n"
@@@ -120,8 -104,6 +120,8 @@@ msgstr "
# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
# �Es que son m�s listos? :-)
#
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Frase contrase�a:"
@@@ -180,25 -151,11 +180,25 @@@ msgstr "Frase contrase�a err�nea
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "no se puede crear %s: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
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:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
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"
@@@ -434,8 -352,6 +434,8 @@@ msgstr "Por favor introduzca frase cont
msgid "Please enter the new passphrase"
msgstr "Por favor escriba la nueva frase contrase�a"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -443,117 -359,86 +443,117 @@@ msgstr "
"@Opciones:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 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:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 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:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "prolijo"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "algo m�s discreto"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "salida de datos estilo sh"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "salida de datos estilo csh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "no independizarse de la consola"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "no acaparar teclado y rat�n"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "usar un fichero log para el servidor"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|usar PGM como el programa para entrada de PIN"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|usar PCM como programa SCdaemon"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "no usar SCdaemon"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|connect to Assuan socket NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NOMBRE|conectar al socket Assuan NOMBRE"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "ignorar peticiones de cambiar el TTY"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "ignorar peticiones de cambiar el display X"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|los PINs en la cach� expiran en N segundos"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "no usar el cach� de PINs al firmar"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "no permite reusar antiguas frases contrase�a"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
#, fuzzy
#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
msgstr "permitir que los clientes marquen claves como \"fiables\""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "permitir preestablecer frase contrase�a"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "permitir emulaci�n de ssh-agent"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -562,21 -447,14 +562,21 @@@ msgstr "no disponible
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -588,151 -466,119 +588,157 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: 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:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() fall�: %s\n"
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "directorio `%s' creado\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, 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:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "manejador 0x%lx para descriptor %d iniciado\n"
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, 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:2392
++#: agent/gpg-agent.c:2400
#, 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:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s detenido\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -752,8 -596,6 +758,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:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -761,9 -603,6 +767,9 @@@ msgstr "
"@�rdenes:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -773,11 -612,9 +779,11 @@@ msgstr "
"Opciones:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Uso: gpg-protect-tool [opciones] (-h para ayuda)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -785,22 -622,18 +791,22 @@@ msgstr "
"Sintaxis: gpg-protect-tool [opciones] [args]\n"
"Herramienta para el mantenimiento de claves secretas\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Introduzca frase contrase�a para desproteger el objeto PKCS#12."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Introduzca la frase contrase�a para proteger el objeto importado en GnuPG"
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -808,11 -641,9 +814,11 @@@ msgstr "
"Por favor introduzca la frase contrase�a o PIN\n"
"necesarios para completar esta operaci�n."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "cancelado\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "error pidiendo la frase contrase�a: %s\n"
@@@ -884,8 -705,6 +890,8 @@@ msgstr "
msgid "Yes"
msgstr "S�"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "No"
@@@ -917,13 -733,11 +923,13 @@@ msgstr "Correcto
msgid "Wrong"
msgstr "Incorrecto"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Nota: Esta frase contrase�a nunca ha sido cambiada.%0APor favor h�galo ahora."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@@ -932,15 -746,12 +938,15 @@@ msgstr "
"Esta frase contrase�a no se ha cambiado%%0Adesde %.4s-%.2s-%.2s.Por favor "
"c�mbiela ahora."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "Cambia la frase contrase�a"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "La cambiar� m�s tarde"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -948,19 -759,16 +954,19 @@@
"%%0A?"
msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "habilita clave"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA necesita un resumen cuya longitud sea m�ltiplo de 8 bits\n"
@@@ -1002,57 -803,47 +1008,62 @@@ msgstr "el algoritmo de protecci�n %d%
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "error creando tuber�a: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error creating a stream for a pipe: %s\n"
msgstr "error creando tuber�a: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "error bifurcando procesos: %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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "fallo esperando que el proceso %d terminara: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
#| msgid "error running `%s': probably not installed\n"
msgid "error running '%s': probably not installed\n"
msgstr "error ejecutando `%s': probablemente no est� instalado\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "error ejecutando `%s': c�digo de finalizaci�n %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
msgstr "error ejecutando `%s': terminado\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "error obteniendo c�digo de finalizaci�n del proceso: %d %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "fallo esperando que el proceso %d terminara: %s\n"
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -1066,15 -855,17 +1077,21 @@@ msgstr "problema de comunicaci�n con e
msgid "problem setting the gpg-agent options\n"
msgstr "problema estableciendo opciones de gpg-agent\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "cancelado por el usuario\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "problema con el agente\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problema con el agente: %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "no se pueden desactivar los volcados de core: %s\n"
@@@ -1144,18 -921,19 +1161,23 @@@ msgstr "agotado nucleo de memoria segur
msgid "out of core while allocating %lu bytes"
msgstr "error de memoria reservando %lu bytes"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "error reservando memoria: %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: opci�n obsoleta \"%s\" - no tiene efecto\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, 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\n"
msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta - no tiene efecto\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1458,7 -1169,6 +1480,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 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "memoria desbordada\n"
@@@ -1467,23 -1176,15 +1489,18 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "opci�n inv�lida \"%.50s\"\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "ha encontrado un error... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' not available\n"
msgid "conversion from '%s' to '%s' not available\n"
msgstr "la conversi�n de `%s' en `%s' no est� disponible\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open fall�: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "conversion from '%s' to '%s' failed: %s\n"
@@@ -1526,86 -1220,72 +1543,92 @@@ msgstr "bloqueo `%s' no hecho: %s\n
msgid "waiting for lock %s...\n"
msgstr "esperando al bloqueo %s...\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "cabecera de armadura inv�lida: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "cabecera de armadura: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "cabecera de firma clara inv�lida\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "cabecera de armadura desconocida: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "firmas en texto claro anidadas\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "armadura inesperada: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "L�nea con guiones inv�lida: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter inv�lido radix64 %02X omitido\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "Fin de suma de comprobaci�n prematuro\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "Suma de comprobaci�n mal creada\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "fin de fichero prematuro (en el cierre)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "error en la l�nea de cierre\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "no se han encontrados datos OpenPGP v�lidos\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"caracter \"quoted printable\" en la armadura - probablemente se us�\n"
"un MTA defectuoso\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "ilegible"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1613,80 -1293,70 +1636,92 @@@ msgstr "
"un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
"acabar con un '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "un nombre de notaci�n no debe contener m�s de un caracter '@'\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "un nombre de notaci�n no debe contener m�s de un caracter '@'\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
+ "acabar con un '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "ilegible"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "fallo al hacer la petici�n proxy %s al cliente\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Introduzca frase contrase�a: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: "
msgid "WARNING: %s\n"
msgstr "ATENCION: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "Esta orden solo est� disponible en tarjetas versi�n 2\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Su elecci�n: "
@@@ -1748,21 -1404,11 +1783,16 @@@ msgstr "URL de donde recuperar la clav
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
- #: g10/card-util.c:799 tools/no-libgcrypt.c:30
- #, c-format
- msgid "error allocating enough memory: %s\n"
- msgstr "error reservando memoria: %s\n"
-
- #: g10/card-util.c:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -1863,13 -1490,10 +1893,13 @@@ msgstr "�De qu� tama�o quiere la clave
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:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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"
@@@ -1930,9 -1544,6 +1960,9 @@@ msgstr " (2) Clave de cifrado\n
msgid " (3) Authentication key\n"
msgstr " (3) Clave de autentificaci�n\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Elecci�n inv�lida.\n"
@@@ -1968,7 -1573,6 +1998,7 @@@ msgstr "�Firmarlo? (s/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "sale de este men�"
@@@ -1976,7 -1579,6 +2006,7 @@@
msgid "show admin commands"
msgstr "ver �rdenes de administrador"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "muestra esta ayuda"
@@@ -2052,124 -1636,95 +2082,124 @@@ msgstr "Se permiten �rdenes de administ
msgid "Admin commands are not allowed\n"
msgstr "No se permiten �rdenes de administrador\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Orden inv�lida (pruebe \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona con esta orden\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "no se puede abrir `%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clave \"%s\" no encontrada: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "error leyendo bloque de claves: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(excepto si especifica la clave dando su huella digital)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
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:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "�Eliminar esta clave del anillo? (s/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
msgid "This is a secret key! - really delete? (y/N) "
msgstr "�Es una clave secreta! �Eliminar realmente? (s/N) "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, 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:198
++#: g10/delkey.c:197
msgid "key"
msgstr "clave"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Clave p�blica: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "borrado de bloque de anillo de claves fallido: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "borrada informaci�n de propietarios\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creando frase contrase�a: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "no puede usar un paquete sim�trico ESK debido al modo S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "usando cifrado %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' ya est� comprimido\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ATENCI�N `%s' es un fichero vac�o\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "leyendo desde `%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2177,7 -1732,6 +2207,7 @@@ msgstr "
"AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
"del destinatario\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2186,40 -1740,33 +2216,40 @@@ msgstr "
"AVISO: forzar el algoritmo de compresi�n %s (%d) va en contra\n"
"de las preferencias del receptor\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
"del destinatario\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "no puede usar %s en modo %s\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "no puede usar %s en modo %s\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "datos cifrados %s\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado con algoritmo desconocido %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problema trabajando con un paquete cifrado\n"
@@@ -2282,134 -1818,106 +2312,134 @@@ 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:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "exportar firmas marcadas como s�lo locales"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr "exportar el atributo ID de usuario (generalmente fotogr�fico)"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "exportar claves de revocaci�n marcadas como \"confidenciales\""
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "borrar partes inutilizables de la clave al exportar"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr "borrar tanto como sea posible de la clave al exportar"
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "no se permite exportar claves secretas\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "ATENCI�N: no se ha exportado nada\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "error creando `%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[ID de usuario no encontrado]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, 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:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "error cerrando %s: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "error escribiendo anillo `%s': %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, 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:1423
++#: g10/getkey.c:1427
#, 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:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "No hay huella dactilar"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "clave secreta \"%s\" no encontrada: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "crea una firma"
@@@ -2417,11 -1924,9 +2447,11 @@@
msgid "make a clear text signature"
msgstr "crea una firma en texto claro"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "crea una firma separada"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifra datos"
@@@ -2429,15 -1933,12 +2459,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "cifra s�lo con un cifrado sim�trico"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "lista claves"
@@@ -2449,15 -1948,12 +2479,15 @@@ msgstr "lista claves y firmas
msgid "list and check key signatures"
msgstr "lista y comprueba firmas de las claves"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "lista claves secretas"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
@@@ -2481,7 -1973,6 +2511,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaci�n"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "elimina claves del anillo p�blico"
@@@ -2513,7 -1998,6 +2543,7 @@@ msgstr "firma la clave localmente
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "cambia una frase contrase�a"
@@@ -2561,23 -2034,18 +2591,23 @@@ msgstr "actualiza la base de datos de c
msgid "print message digests"
msgstr "imprime res�menes de mensaje"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "ejecutar en modo servidor"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID-USUARIO|cifra para ID-USUARIO"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
@@@ -2589,11 -2055,9 +2619,11 @@@ msgstr "|N|nivel de compresi�n N (0 des
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FICHERO|volcar salida en FICHERO"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "no hace ning�n cambio"
@@@ -2609,7 -2071,6 +2639,7 @@@ msgstr "usar estilo OpenPGP estricto
# 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:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2617,7 -2078,6 +2647,7 @@@ msgstr "
"@\n"
"(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2637,13 -2097,11 +2667,13 @@@ msgstr "
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2658,7 -2116,6 +2688,7 @@@ msgstr "
"firma, comprueba, cifra o descifra\n"
"la operaci�n por defecto depende de los datos de entrada\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2666,81 -2123,66 +2696,81 @@@ msgstr "
"\n"
"Algoritmos disponibles:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Clave p�blica: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Cifrado: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Resumen: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Compresi�n: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "uso: gpgsm [opciones] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "�rdenes incompatibles\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2750,20 -2192,17 +2780,20 @@@ msgstr "
"AVISO: propiedad insegura del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2774,494 -2213,387 +2804,494 @@@ msgstr "
"AVISO: permisos inseguros del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, 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:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "mostrar foto IDs al listar claves"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, 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:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "mostrar URLS de pol�tica al listar firmas"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "mostrar todas las notaciones al listar firmas"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "mostrar notaciones est�ndar IETF al listar firmas"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "mostrar notaciones personalizadas al listar firmas"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr "mostrar URL del servidor de claves preferido al listar firmas"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "mostrar validez de la ID de usuario al listar claves"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr "mostrar subclaves revocadas y expiradas al listar claves"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "mostrar nombre de los anillos de claves al listar claves"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "mostrar fechas de caducidad al listar firmas"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Claves disponibles:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "opci�n desconocida `%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
#| msgid "unknown command `%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "orden desconocida `%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, 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:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "no se puede interpretar la URL del servidor de claves\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "opciones del servidor de claves inv�lidas\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "opciones de importaci�n inv�lidas\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "opciones de exportaci�n inv�lidas\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: lista de opciones inv�lida\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "lista de opciones inv�lida\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "mostrar foto IDs al verificar firmas"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "mostrar URLs de pol�tica al verificar firmas"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "mostrar todas las notaciones al verificar firmas"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "mostrar notaciones personalizadas al verificar firmas"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "mostrar validez del ID de usuario al verificar firmas"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
msgid "show only the primary user ID in signature verification"
msgstr "mostrar solo ID primario de usuario al verificar firmas"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "validar firmas con datos PKA"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "opciones de verificaci�n inv�lidas\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "imposible establecer camino de ejecutables %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, 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:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "lista de auto-localizaci�n de claves inv�lida\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sustituye a %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s no permitido con %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s no tiene sentido con %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "preferencias por defecto inv�lidas\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "preferencias personales de cifrado inv�lidas\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "preferencias personales de compresi�n inv�lidas\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s a�n no funciona con %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, 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:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, 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:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nombre_fichero]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
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:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nombre_fichero]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
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:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nombre_fichero]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key id-usuario"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usuario"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usuario [�rdenes]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd <id-usuario>"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "env�o al servidor de claves fallido: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepci�n del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "exportaci�n de clave fallida: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "exportaci�n de clave fallida: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "b�squeda del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "renovaci�n al servidor de claves fallida: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaci�n de armadura fallida: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaci�n de armadura fallida: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, 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:4537
++#: g10/gpg.c:4544
#, 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:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[nombre_fichero]"
@@@ -3269,19 -2601,15 +3299,19 @@@
# En espa�ol no se deja espacio antes de los puntos suspensivos
# (Real Academia dixit) :)
# Tomo nota :-). Este comentario d�jalo siempre.
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "URL de pol�tica de certificado inv�lida\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "URL de pol�tica inv�lida\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL del servidor de claves preferido no es v�lida\n"
@@@ -3293,7 -2619,6 +3323,7 @@@ msgstr "|FICHERO|tomar las claves del a
msgid "make timestamp conflicts only a warning"
msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
@@@ -3319,128 -2640,102 +3349,128 @@@ msgstr "Ayuda no disponible
msgid "No help available for '%s'"
msgstr "No hay ayuda disponible para `%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "importar firmas marcadas como s�lo locales"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "reparar da�o del servidor de claves p�blicas al importar"
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "no actualiza la base de datos de confianza despu�s de importar"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "no actualiza la base de datos de confianza despu�s de importar"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "s�lo aceptar actualizaciones de claves ya existentes"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "borrar partes in�tiles de la clave despu�s de importar"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "borrar tanto como sea posible de la clave tras importar"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "omitiendo bloque de tipo %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu claves procesadas hasta ahora\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Cantidad total procesada: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " omitidas nuevas claves: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " omitidas nuevas claves: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin identificador: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuevos identificativos: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuevas subclaves: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuevas firmas: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nuevas revocaciones de claves: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claves secretas le�das: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " claves secretas importadas: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claves secretas sin cambios: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " no importadas: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " firmas limpiadas: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " IDs de usuario limpiados: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3449,202 -2744,162 +3479,202 @@@ msgstr "
"AVISO: la clave %s contiene preferencias para algoritmos\n"
"no disponibles en estos IDs de usuario:\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": algoritmo de cifrado preferido %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": algoritmo de resumen preferido %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": algoritmo de compresi�n preferido %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"re-dustribuya esta clave para evitar potenciales problemas de\n"
"diferencias en los algoritmos.\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "clave %s: sin identificador de usuario\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "omitido \"%s\": %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clave %s: reparada la subclave PKS corrompida\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clave %s: sin identificadores de usuario v�lidos\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clave %s: clave p�blica no encontrada: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "clave %s: clave nueva - omitida\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "anillo de claves no escribible encontrado: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clave %s: clave p�blica \"%s\" importada\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clave %s: no coincide con nuestra copia\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clave %s: \"%s\" 1 firma nueva\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clave %s: \"%s\" %d firmas nuevas\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clave %s: \"%s\" 1 subclave nueva\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clave %s: \"%s\" %d identificador de usuario limpiado\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clave %s: \"%s\" %d identificadores de usuario limpiados\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clave %s: \"%s\" sin cambios\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clave %s: clave secreta importada\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, 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:1684
++#: g10/import.c:1683
#, 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:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "no se permite importar claves secretas\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3659,203 -2914,186 +3689,228 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clave %s: firma directa de clave inv�lida\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clave %s: uni�n de subclave inv�lida\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clave %s: revocaci�n de subclave inv�lida\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clave %s: omitido ID de usuario \"%s\"\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clave %s: subclave omitida\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clave %s: detectado usuario duplicado - fusionada\n"
- #: g10/import.c:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clave %s: firma directa de clave a�adida\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
#| msgid "error creating keybox `%s': %s\n"
msgid "error creating keybox '%s': %s\n"
msgstr "error creando caja de claves `%s': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
#| msgid "keybox `%s' created\n"
msgid "keybox '%s' created\n"
msgstr "caja de claves `%s' creada\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "anillo `%s' creado\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, 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:908
++#: g10/keydb.c:907
#, 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:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revocaci�n]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[autofirma]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d firmas incorrectas\n"
- msgstr[1] "%d firmas incorrectas\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "revoke signatures"
+ msgid " (reordered signatures follow)"
+ msgstr "revoca firmas"
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "skipped \"%s\": %s\n"
+ msgid "key %s:\n"
+ msgstr "omitido \"%s\": %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
+ msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3863,23 -3101,26 +3918,30 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 firma no comprobada por falta de clave\n"
msgstr[1] "1 firma no comprobada por falta de clave\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 firma no comprobada por causa de un error\n"
- msgstr[1] "1 firma no comprobada por causa de un error\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d firmas incorrectas\n"
+ msgstr[1] "%d firmas incorrectas\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "Detectados %d identificadores de usuario sin autofirma v�lida\n"
- msgstr[1] "Detectados %d identificadores de usuario sin autofirma v�lida\n"
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Firma correcta de"
+ msgstr[1] "Firma correcta de"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3891,17 -3132,14 +3953,17 @@@ msgstr "
"pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Conf�o un poco\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Conf�o totalmente\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3911,50 -3149,38 +3973,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:501
++#: g10/keyedit.c:1014
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:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID de usuario \"%s\" revocado."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Imposible firmar.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ID de usuario \"%s\" expirado."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID de usuario \"%s\" no tiene autofirma."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID de usuario \"%s\" puede firmarse."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "�Firmarlo? (s/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3963,11 -3189,9 +4025,11 @@@ msgstr "
"La autofirma en \"%s\"\n"
"es una firma de tipo PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3976,11 -3200,9 +4038,11 @@@ msgstr "
"Su firma actual en \"%s\"\n"
"ha expirado.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3989,43 -3211,34 +4051,43 @@@ msgstr "
"Su firma actual en \"%s\"\n"
"es una firma local.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" ya estaba firmada por la clave %s\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�Quiere firmarlo a�n as�? (s/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada que firmar con la clave %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "�Esta clave ha caducado!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta clave expirar� el %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4035,33 -3248,27 +4097,33 @@@ msgstr "
"firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
"contestar, introduzca \"0\".\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) No contesto.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, 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:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) He hecho una comprobaci�n informal.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Lo he comprobado meticulosamente.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, 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:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4070,227 -3277,169 +4132,223 @@@ msgstr "
"�Est� realmente seguro de querer firmar esta clave\n"
"con su clave: \"%s\" (%s)?\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Esto ser� una autofirma.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "La firma se marcar� como no exportable.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "La firma se marcar� como no revocable.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "No he comprobado esta clave en absoluto.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "He comprobado esta clave informalmente.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "He comprobado esta clave meticulosamente.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "�Firmar de verdad? (s/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
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:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "moviendo la firma de la clave al lugar correcto\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "graba y sale"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "muestra huella dactilar de la clave"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Introduzca keygrip: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "lista clave e identificadores de usuario"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "selecciona identificador de usuario N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "selecciona subclave N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "comprueba firmas"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "firma localmente los IDs de usuarios elegidos"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "firmar IDs seleccionados con firma de confianza"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr "firmar IDs seleccionados con firma no revocable"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "a�adir un identificador de usuario"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "a�adir un ID fotogr�fico"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "borrar identificadores de usuario seleccionados"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "a�adir una subclave"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "a�adir clave a tarjeta"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "mover una clave a la tarjeta"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "mover una clave de respaldo a la tarjeta"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "borrar clave secundaria"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "a�adir una clave de revocaci�n"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "borrar firmas de los ID seleccionados"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
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:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "marcar ID de usuario seleccionado como primario"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "mostrar preferencias (experto)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "mostrar preferencias (prolijo)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "establecer preferencias para todos los ID seleccionados"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
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:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "establecer notaci�n para los IDs de usuario seleccionados"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "cambia la frase contrase�a"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "cambia valores de confianza"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "revocar firmas de los identificadores seleccionados"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "revocar los identificadores seleccionados"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "revoca clave o subclaves seleccionadas"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "habilita clave"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "deshabilita clave"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "mostrar fotos de los ID seleccionados"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
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:1465
++#: g10/keyedit.c:1931
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:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Clave secreta disponible.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Se necesita la clave secreta para hacer esto.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4308,258 -3457,206 +4366,264 @@@ 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:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "La clave est� revocada."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, 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:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, 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:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "�Realmente cambiar de sitio la clave primaria? (s/N)"
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Debe seleccionar exactamente una clave.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "La orden espera un nombre de fichero como argumento\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, 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:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar por lo menos una clave.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
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:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "�De verdad quiere borrar esta clave? (s/N) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "�Revocar realmente este identificador de usuario? (s/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
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:2099
++#: g10/keyedit.c:2565
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:2101
++#: g10/keyedit.c:2567
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "�De verdad quiere revocar esta subclave? (s/N) "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
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:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Establecer lista de preferencias a:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "�Actualizar realmente las preferencias? (s/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "�Grabar cambios? (s/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "�Salir sin grabar? (s/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "actualizaci�n fallida: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "huella dactilar no v�lida"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, 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:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "valor inv�lido\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "ID de usuario inexistente.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, 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:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Resumen: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Caracter�sticas: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "Sevidor de claves no-modificar"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Servidor de claves preferido: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "Notaciones: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(confidencial)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "creado: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "revocada: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "caduc�: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "caduca: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "num. tarjeta: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "confianza: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "validez: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Esta clave est� deshabilitada"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4567,17 -3664,12 +4631,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "revocada"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "caducada"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4585,17 -3677,14 +4649,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4604,35 -3693,27 +4668,35 @@@ msgstr "
"AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
"hacer que algunas versiones de PGP rechacen esta clave.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�Est� seguro de querer a�adirla? (s/N) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
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:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "�Borrar esta firma correcta? (s/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�Borrar esta firma inv�lida? (s/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�Borrar esta firma desconocida? (s/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "�Borrar realmente esta autofirma? (s/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4640,20 -3721,16 +4704,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d firmas borradas.\n"
msgstr[1] "%d firmas borradas.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "No se borr� nada\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "inv�lida"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID de usuario \"%s\" compactado: %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4661,17 -3738,14 +4725,17 @@@ msgid_plural "User ID \"%s\": %d signat
msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID de usuario \"%s\": ya minimizado\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID de usuario \"%s\" ya limpiado\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4680,38 -3754,30 +4744,38 @@@ msgstr "
"AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
" hacer que algunas versiones de PGP rechacen esta clave.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduzca el ID de usuario del revocador designado: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
msgid "this key has already been designated as a revoker\n"
msgstr "esta clave ya ha sido designada como revocadora\n"
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
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:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4721,227 -3787,177 +4785,227 @@@ msgid "
msgstr ""
"�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambiando fecha de caducidad de subclave.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando caducidad de clave primaria.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, 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:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
- #: g10/keyedit.c:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "Introduzca la URL de su servidor de claves preferido: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�Seguro que quiere reemplazarlo? (s/N) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�Seguro que quiere borrarlo? (s/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "Introduzca la notaci�n: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "�Continuar? (s/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, 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:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "No hay ID de usuario con hash %s\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "No existe una subclave con �ndice %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usuario: \"%s\"\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (no exportable)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta firma caduc� el %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�De verdad quiere revocarla? (s/N) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
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:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "No est� firmado por usted.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (no revocable)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revocada por la clave %s el %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Va a revocar las siguientes firmas:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "no hay clave secreta\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "La clave %s ya ha sido revocada.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "La subclave %s ya ha sido revocada.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
msgstr "preferencia `%s' duplicada\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "demasiadas preferencias de cifrado\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "demasiadas preferencias de resumen\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "demasiadas preferencias de compresi�n\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "caracter inv�lido `%s' en cadena de preferencias\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "escribiendo firma directa\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "escribiendo autofirma\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "escribiendo la firma de comprobaci�n de clave\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tama�o de clave redondeado a %u bits\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"AVISO: ciertos programas OpenPGP no usan claves DSAcon res�menes de este "
"tama�o\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Firma"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Certificar"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Cifrado"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Autentificaci�n"
@@@ -4955,158 -3971,127 +5019,158 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "FfCcAaSs"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Posibles accriones para una %s clave: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "Acciones permitidas actualmente: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Conmutar la capacidad de firmar\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Conmutar la capacidad de cifrado\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Conmutar la capacidad de autenticaci�n\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Acabado\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Por favor seleccione tipo de clave deseado:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA y RSA (por defecto)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA y ElGamal\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (s�lo firmar)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (s�lo firmar)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (s�lo cifrar)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (s�lo cifrar)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (permite elegir capacidades)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (permite elegir capacidades)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
#| msgid " (%d) DSA and Elgamal\n"
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA y ElGamal\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (s�lo firmar)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (permite elegir capacidades)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (s�lo cifrar)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
#| msgid " (%d) Existing key\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Clave existente\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "Introduzca keygrip: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "No es un keygrip v�lido (se esperaban 40 d�gitos hex)\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "No hay claves con ese keygrip\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "�De qu� tama�o quiere la subclave? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "�De qu� tama�o quiere la clave? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "El tama�o requerido es de %u bits\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "redondeados a %u bits\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Por favor seleccione tipo de clave deseado:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5122,7 -4107,6 +5186,7 @@@ msgstr "
" <n>m = la clave caduca en n meses\n"
" <n>y = la clave caduca en n a�os\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5138,38 -4122,30 +5202,38 @@@ msgstr "
" <n>m = la clave caduca en n meses\n"
" <n>y = la clave caduca en n a�os\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "�Validez de la clave (0)? "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Clave v�lida �durante? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "valor inv�lido\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "La clave nunca caduca\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "La firma nunca caduca\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "La clave caduca %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "La firma caduca el %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5177,11 -4153,9 +5241,11 @@@ msgstr "
"Su sistema no puede mostrar fechas m�s all� del 2038.\n"
"Sin embargo funcionar� correctamente hasta el 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "�Es correcto? (s/n) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5195,7 -4169,6 +5259,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5211,50 -4184,39 +5275,50 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Nombre y apellidos: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Caracter inv�lido en el nombre\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "El nombre no puede empezar con un n�mero\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "El nombre debe tener al menos 5 caracteres\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Direcci�n de correo electr�nico: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Direcci�n inv�lida\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Comentario: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Caracter inv�lido en el comentario\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5265,7 -4227,6 +5329,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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 "
@@@ -5282,31 -4243,24 +5346,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcDdVvSs"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "�Cambia (N)ombre, (D)irecci�n o (S)alir? "
- #: g10/keygen.c:2658
++#: g10/keygen.c:2671
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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Por favor corrija primero el error.\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5319,12 -4273,10 +5383,12 @@@ msgstr "
"generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
"entrop�a.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creaci�n de la clave fallida: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5332,71 -4284,58 +5396,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, 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:3501
++#: g10/keygen.c:3514
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "�Crear de todas formas?"
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "�Crear de todas formas?"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Creaci�n de claves cancelada.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "claves p�blica y secreta creadas y firmadas.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5404,7 -4343,6 +5468,7 @@@ msgstr "
"Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
"la orden \"--edit-key\" para crear una subclave con este prop�sito.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5412,7 -4350,6 +5476,7 @@@ msgstr "
"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5420,49 -4357,38 +5484,49 @@@ msgstr "
"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
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:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "�Crear de verdad? (s/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "nunca "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Pol�tica de firmas cr�ticas: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Pol�tica de firmas: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Servidor de claves cr�tico preferido: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Notaci�n de firmas cr�ticas: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Notaci�n de firma: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5470,55 -4396,51 +5534,63 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d firmas incorrectas\n"
msgstr[1] "%d firmas incorrectas\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 firma no comprobada por causa de un error\n"
+ msgstr[1] "1 firma no comprobada por causa de un error\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Anillo de claves"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "omitido \"%s\": %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Huellas dactilares de la clave primaria:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Huella clave primaria:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " Huella de clave ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " N�mero de serie de la tarjeta ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "memorizando anillo `%s'\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5526,7 -4448,6 +5598,7 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu claves memorizadas hasta ahora (%lu firmas)\n"
msgstr[1] "%lu claves memorizadas hasta ahora (%lu firmas)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5534,7 -4455,6 +5606,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu claves actualizadas\n"
msgstr[1] "\t%lu claves actualizadas\n"
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5542,58 -4462,45 +5614,58 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 firma incorrecta\n"
msgstr[1] "1 firma incorrecta\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anillo creado\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "incluir claves revocadas en resultados de la b�squeda"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "incluir subclaves al buscar por ID de clave"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "recuperar autom�ticamente claves al verificar firmas"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
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:104
++#: g10/keyserver.c:103
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:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "deshabilitado"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Introduzca n�mero(s), O)tro, o F)in >"
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, 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:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, 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:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5601,468 -4508,374 +5673,468 @@@ msgid_plural "refreshing %d keys from %
msgstr[0] "renovando %d claves desde %s\n"
msgstr[1] "renovando %d claves desde %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "clave \"%s\" no encontrada en el servidor\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "clave no encontrada en el servidor\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "solicitando clave %s de %s servidor %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "solicitando clave %s de %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "enviando clave %s a %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, 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:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: imposible recuperar URI %s: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s clave de sesi�n cifrada\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "frase contrase�a generada con algoritmo de resumen desconocido %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "la clave p�blica es %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrado con clave %2$s de %1$u bits, ID %3$s, creada el %4$s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrado con clave %s, ID %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "descifrado de la clave p�blica fallido: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifrado con %lu frases contrase�a\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "cifrado con 1 frase contrase�a\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "suponiendo %s datos cifrados\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "descifrado correcto\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "descifrado fallido: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nombre fichero original='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "AVISO: se observan varios textos en claro\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "no se encontr� firma\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma INCORRECTA de \"%s\""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma caducada de \"%s\""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "Firma correcta de \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "suprimida la verificaci�n de la firma\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "no puedo manejar estos datos ambiguos en la firma\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Firmado el %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " usando %s clave %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Clave disponible en: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[incierto]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma caducada en %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "La firma caduca el %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binaria"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "modotexto"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "desconocido"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "Algoritmo de clave p�blica desconocido"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposible comprobar la firma: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "no es una firma separada\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma independiente de clase 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "firma al viejo estilo (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) fall� en %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
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:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "AVISO: el algoritmo de resumen %s est� obsoleto\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "error de lectura `%s': %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "error de lectura `%s': %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opci�n obsoleta \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "por favor use \"%s%s\" en su lugar\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Sin comprimir"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "sin_comprimir|ninguno"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "opci�n ambigua `%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "opci�n desconocida `%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
#, 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:1754
++#: g10/misc.c:1752
#, 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
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "El fichero `%s' ya existe. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "�Sobreescribir? (s/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: sufijo desconocido\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Introduzca nuevo nombre de fichero"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "escribiendo en stdout\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "asumiendo que hay datos firmados en `%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "creado un nuevo fichero de configuraci�n `%s'\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problema con el agente: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr "(ID de clave primaria %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6077,15 -4890,12 +6149,15 @@@ msgstr "
"con %u bits clave %s, ID %s,\n"
"creada el %s%s.\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Introduzca frase contrase�a\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "cancelado por el usuario\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6094,53 -4904,44 +6166,53 @@@ msgstr "
"Necesita una frase contrase�a para desbloquear la clave secreta\n"
"del usuario: \"%s\"\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (subclave en clave principal ID %s)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
#| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Introduzca frase contrase�a para desproteger el objeto PKCS#12."
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6198,31 -4991,24 +6270,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "No se dio ninguna raz�n"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "La clave ha sido reemplazada."
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "La clave ha sido comprometida"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "La clave ya no est� en uso"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "El identificador de usuario ya no es v�lido"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "raz�n para la revocaci�n: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "comentario a la revocaci�n: "
@@@ -6236,54 -5022,43 +6308,54 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "No hay confianza definida para:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " alias \"%s\"\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, 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:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NO tengo confianza\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = conf�o absolutamente\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = volver al men� principal\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = saltar esta clave\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " q = salir\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6292,41 -5067,33 +6364,41 @@@ msgstr "
"El m�nimo nivel de confianza para esta clave es: %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "�Su decisi�n? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "Esta clave probablemente pertenece al usuario que se nombra\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Esta clave nos pertenece\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6336,135 -5103,107 +6408,135 @@@ msgstr "
"identificador de usuario. Si *realmente* sabe lo que est� haciendo,\n"
"puede contestar s� a la siguiente pregunta.\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "�Usar esta clave de todas formas? (s/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "ATENCI�N: �Usando una clave no fiable!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " Esto puede significar que la firma est� falsificada.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta clave est� deshabilitada.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, 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:589
++#: g10/pkclist.c:604
#, 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:601
++#: g10/pkclist.c:616
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:609
++#: g10/pkclist.c:624
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:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Nota: �Esta clave ha caducado!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma es probablemente una FALSIFICACI�N.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitida: clave p�blica deshabilitada\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitida: clave p�blica ya presente\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "no se puede conectar con `%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "l�nea %d: algoritmo inv�lido\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "l�nea %d: algoritmo inv�lido\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Destinatarios actuales:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6472,168 -5211,132 +6544,168 @@@ msgstr "
"\n"
"Introduzca ID de usuario. Acabe con una l�nea vac�a: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "ID de usuario inexistente.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Clave p�blica deshabilitada.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "omitida: clave p�blica ya establecida\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "desconocido el destinatario predefinido \"%s\"\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "no hay direcciones v�lidas\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Nota: la clave %s no usa %s\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Firma separada.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Introduzca el nombre del fichero de datos: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "leyendo stdin...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "no hay datos firmados\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "imposible abrir datos firmados fd=%d: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinatario an�nimo; probando clave secreta %s ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "de acuerdo, somos el destinatario an�nimo.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "la antigua codificaci�n de la DEK no puede usarse\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "NOTA: el cifrado %s no aparece en las preferencias del receptor\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTA: clave secreta %s caduc� el %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "construcci�n del paquete fallida: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "clave %s: sin identificador de usuario\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Ser� revocado por:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Este es una clave de revocaci�n confidencial)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "Clave secreta disponible.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "se fuerza salida con armadura ASCII.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet fall�: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Certificado de revocaci�n creado.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6642,20 -5345,17 +6714,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Certificado de revocaci�n creado.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6664,22 -5364,18 +6736,22 @@@ msgstr "clave secreta \"%s\" no encontr
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
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:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6698,80 -5394,64 +6770,80 @@@ msgstr "
"de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
"a otras personas!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Por favor elija una raz�n para la revocaci�n:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Cancelar"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Raz�n para la revocaci�n: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(No se di� descripci�n)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "�Es correcto? (s/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "creada clave d�bil - reintentando\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
"intentos!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, fuzzy, c-format
#| msgid "%s key uses an unsafe (%u bit) hash\n"
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "la clave %s usa un hash inseguro (de %u bits)\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, fuzzy, c-format
#| msgid "DSA key %s requires a %u bit or larger hash\n"
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:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, 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:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6779,7 -5459,6 +6851,7 @@@ msgid_plural "public key %s is %lu seco
msgstr[0] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
msgstr[1] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6787,7 -5466,6 +6859,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
msgstr[1] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6802,7 -5480,6 +6874,7 @@@ msgstr[1] "
"la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
"o problemas con el reloj)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6816,41 -5493,34 +6888,41 @@@ msgstr[1] "
"la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
"o problemas con el reloj)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, 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:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6858,7 -5528,6 +6930,7 @@@ msgstr "
"AVISO: no puedo expandir el %% de la url de pol�tica (demasiado larga).\n"
"Se usa sin expandir.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6867,12 -5536,10 +6939,12 @@@ msgstr "
"AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
"preferido. Se usa sin expandir.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s firma de: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6880,39 -5547,31 +6952,39 @@@ msgstr "
"AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
"preferencias del destinatario\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "firmando:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "se usar� un cifrado %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\" omitido: duplicado\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "omitido: clave secreta ya presente\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6921,328 -5580,265 +6993,328 @@@ msgstr "
"# Lista de valores de confianza asignados, creada %s\n"
"# (Use \"gpg --import-ownertrust\" para restablecerlos)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error in '%s': %s\n"
msgstr "error en `%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "l�nea demasiado larga"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "falta una coma"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "huella dactilar no v�lida"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "falta el valor de confianza"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
#| msgid "error finding trust record in `%s': %s\n"
msgid "error finding trust record in '%s': %s\n"
msgstr "error econtrando registro de confianza en `%s': %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "read error in '%s': %s\n"
msgstr "error de lectura `%s': %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
#| msgid "can't create lock for `%s'\n"
msgid "can't create lock for '%s'\n"
msgstr "no se puede crear el bloqueo para `%s'\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
#| msgid "can't lock `%s'\n"
msgid "can't lock '%s'\n"
msgstr "no se puede bloquear `%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
"registro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
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:606
++#: g10/tdbio.c:675
+ #, c-format
+ msgid "%s: directory does not exist!\n"
+ msgstr "%s: �el directorio no existe!\n"
+
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
msgstr "no se puede acceder a `%s': %s\n"
- #: g10/tdbio.c:688
- #, c-format
- msgid "%s: directory does not exist!\n"
- msgstr "%s: �el directorio no existe!\n"
-
- #: g10/tdbio.c:711
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: se ha creado base de datos de confianza inv�lida\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: se ha creado base de datos de confianza\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "NOTA: no se puede escribir base de datos de confianza\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: base de datos de confianza inv�lida\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: error actualizando el registro de versi�n: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: error leyendo registro de versi�n: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: error escribiendo registro de versi�n: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de datos de confianza: fallo lseek: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: no es una base de datos de confianza\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versi�n del fichero %d inv�lida\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: error leyendo registro libre: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: error escribiendo registro de directorio: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: fallo en poner a cero un registro: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: fallo al a�adir un registro: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "Error: base de datos de confianza corrupta.\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "l�nea de longitud superior a %d caracteres\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "error enviando opciones est�ndar: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "algoritmo no disponible: %s"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "error escribiendo anillo privado `%s': %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: error escribiendo registro de directorio: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "error abriendo `%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "clave p�blica %s no encontrada: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
#| msgid "error storing flags: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "error almacenando par�metros: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "error obteniendo nuevo PIN: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Pol�tica: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "error obteniendo par�metros almacenados: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista claves"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7250,21 -5846,18 +7322,21 @@@ msgid_plural "%ld messages signed
msgstr[0] "imprime res�menes de mensaje"
msgstr[1] "imprime res�menes de mensaje"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7274,177 -5867,158 +7346,189 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "error creando tuber�a: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, fuzzy, c-format
#| msgid "second"
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] "segundo"
msgstr[1] "segundo"
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "imprime res�menes de mensaje"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "error enviando orden %s: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "clave %s: aceptada como clave fiable\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "clave %s marcada como de confianza absoluta\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
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:431
++#: g10/trustdb.c:430
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:468
++#: g10/trustdb.c:467
#, 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:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "usando %s como modelo de confianza\n"
@@@ -7453,7 -6026,6 +7537,7 @@@
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:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
@@@ -7507,7 -6071,6 +7591,7 @@@ msgstr "no se encuentran claves absolut
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7515,30 -6078,24 +7599,30 @@@ msgstr "
"nivel: %d validez: %3d firmada: %3d confianza: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
"no se puede actualizar el registro de la versi�n de la base de datos\n"
"de confianza: fallo de escritura: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "no definido"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "nunca"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "dudosa"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "total"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "absoluta"
@@@ -7550,41 -6107,32 +7634,41 @@@
#. 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
++#: g10/trust.c:146
#, fuzzy
#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "13 no apto para supersticiosos"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ revocada ]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[ caducada ]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[desconocida]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[no definida]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[ dudosa ]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ total ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ absoluta ]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7594,12 -6142,10 +7678,12 @@@ msgstr "
"Por favor recuerde que el fichero de firma (.sig o .asc)\n"
"deber�a ser el primero que se da en la l�nea de �rdenes.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "la l�nea %u es demasiado larga o no tiene avance de l�nea (LF)\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "no se puede abrir fd %d: %s\n"
@@@ -7936,7 -6414,6 +8020,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:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
@@@ -8089,9 -6536,6 +8173,9 @@@ msgstr "n�mero de certificados coincide
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "fallo buscando la clave s�lo cach� de dirmngr: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "fallo al reservar handle de keyDB\n"
@@@ -8605,7 -6944,6 +8689,7 @@@ msgstr "(no parece un mensaje cifrado)\
msgid "certificate '%s' not found: %s\n"
msgstr "certificado `%s' no encontrado: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "error bloqueando keybox: %s\n"
@@@ -8631,87 -6965,66 +8715,87 @@@ msgstr "borrado del certificado \"%s\"
msgid "no valid recipients given\n"
msgstr "no se dieron receptores v�lidos\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "lista claves externas"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "lista de cadenas de certificados"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "importa certificado"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "exporta certificado"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "registrar tarjeta inteligente"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "pasar una orden a dirmngr"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "invocar gpg-protect-tool"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "crea una salida en base-64"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "asumir entrada en formato PEM"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "asumir entrada en formato base-64"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "asumir entrada en formato binario"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "nunca consultar una CRL"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "comprabar validez usando OCSP"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|n�mero de certificados que incluir"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|FICHERO|tomar pol�tica de informaci�n de FICHERO"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "no comprobar pol�ticas de certificados"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "recuperar certificados de emisor perdidos"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "no usa la terminal en absoluto"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|FICHERO|escribir un log en modo servidor en FICHERO"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHERO|escribir inform de auditor�a a FICHERO"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "proceso por lotes: nunca preguntar"
@@@ -8721,41 -7034,32 +8805,41 @@@
# Adem�s una de las acepciones de asumir es "aceptar algo" y suponer
# viene a ser asumir una idea como propia. Suponer "s�" en casi todas las
# preguntas no me acaba de gustar.
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "asume \"s�\" en casi todas las preguntas"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "asume \"no\" en casi todas las preguntas"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FICHERO|a�ade este anillo a la lista de anillos"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ID-USUARIO|usa ID-USUARIO como clave secreta por defecto"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ESPEC|usa este servidor para buscar claves"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
@@@ -8770,50 -7074,41 +8854,50 @@@ msgstr "
"firma, comprueba, cifra o descifra usando protocolo S/MIME\n"
"la operaci�n por defecto depende de los datos de entrada\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "NOTA: no se podr� cifrar a `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
#| msgid "unknown validation model `%s'\n"
msgid "unknown validation model '%s'\n"
msgstr "modelo de validaci�n desconocido `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: falta el nombre del host\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: se dio contrase�a sin usuario\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: omitir esta l�nea\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "no se puede interpretar el servidor de claves\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "importando certificados comunes `%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
#| msgid "can't sign using `%s': %s\n"
msgid "can't sign using '%s': %s\n"
msgstr "no puedo firmar usando `%s': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "orden inv�lida (no hay orden impl�cita)\n"
@@@ -8830,7 -7122,6 +8914,7 @@@ msgstr "error almacenando certificado\n
msgid "basic certificate checks failed - not imported\n"
msgstr "fallaron comprobaciones b�sicas sobre el certificado - no importado\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "error obteniendo par�metros almacenados: %s\n"
@@@ -8845,31 -7134,25 +8929,31 @@@ msgstr "error importando el certificado
msgid "error reading input: %s\n"
msgstr "error leyendo entrada: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "fallo obteniendo huella digital\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "problema buscando el certificado existente: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "error obteniendo keyDB para escribir: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "error almacenando certificado: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "problema re-buscando el certificado: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "error almacenando par�metros: %s\n"
@@@ -9064,7 -7314,6 +9148,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
@@@ -9076,8 -7324,6 +9160,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:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
@@@ -9751,13 -7874,11 +9835,13 @@@ msgstr "exporta certificado
msgid "force the use of the default OCSP responder"
msgstr "Introduzca el ID de usuario del revocador designado: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9765,91 -7886,75 +9849,91 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, 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:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "actualizaci�n fallida: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, 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:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, 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:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate is valid\n"
msgstr "certificado correcto\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
#| msgid "certificate has been revoked"
msgid "certificate has been revoked\n"
msgstr "el certificado ha sido revocado"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, 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:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported inquiry '%s'\n"
msgstr "algoritmo no disponible: %s"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -10029,13 -8100,11 +10113,13 @@@ msgstr "uso: gpgsm [opciones]
msgid "colons are not allowed in the socket name\n"
msgstr "�%s no permitido con %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, 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:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
@@@ -10579,87 -8546,71 +10663,87 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, 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:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, 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:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, 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:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, 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:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, 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:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/et.po
index 762a386,ccd011b..16c2354
--- a/po/et.po
+++ b/po/et.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome at microlink.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@@ -98,8 -82,6 +98,8 @@@ msgstr "Palun sisestage parool; see on
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "halb parool"
@@@ -155,25 -126,11 +155,25 @@@ msgstr "halb parool
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -382,8 -300,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muuda parooli"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,118 -309,87 +393,118 @@@ msgstr "
"V�tmed:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "ole jutukas"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ole m�nev�rra vaiksem"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "otsi v�tmeid v�tmeserverist"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "uuenda usalduse andmebaasi"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NIMI|terminali kooditabel on NIMI"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ei ole toetatud"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -513,164 -398,124 +513,169 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: kataloog on loodud\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: kataloogi ei �nnestu luua: %s\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: j�tsin vahele: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -686,8 -529,6 +691,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -695,9 -536,6 +700,9 @@@ msgstr "
"@K�sud:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -707,46 -545,38 +712,46 @@@ msgstr "
"V�tmed:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "Katkesta"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
@@@ -810,8 -630,6 +815,8 @@@ msgstr "
msgid "Yes"
msgstr "jah"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -841,46 -656,38 +846,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "muuda parooli"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "luba v�ti"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -921,53 -721,42 +926,57 @@@ msgstr "kaitse algoritm %d%s ei ole toe
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "viga `%s' lugemisel: %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "uuendamine eba�nnestus: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -982,17 -769,18 +991,22 @@@ msgstr "probleem gpg-agent programmiga
msgid "problem setting the gpg-agent options\n"
msgstr "probleem agendiga: agent tagastas 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "katkestatud kasutaja poolt\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "probleem agendiga: agent tagastas 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "probleem agendiga: agent tagastas 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
@@@ -1063,17 -837,18 +1077,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, fuzzy, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1401,7 -1109,6 +1420,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "ei t��deldud"
@@@ -1411,22 -1117,14 +1430,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "vigased impordi v�tmed\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "te leidsite vea ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "faili ei �nnestu avada: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
@@@ -1465,88 -1156,74 +1479,94 @@@ msgstr "ei leia avalikku v�tit %08lX: %
msgid "waiting for lock %s...\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "pakend: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "vigane pakendi p�is: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "pakendi p�is: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "vigane avateksti allkirja p�is\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "pakendi p�is: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "avateksti allkirjad �ksteise sees\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "ootamatu pakend:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "vigane kriipsudega m�rgitud rida: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "enneaegne failil�pp (puudub CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "enneaegne failil�pp (poolik CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "vigane CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC viga; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "enneaegne failil�pp (l�petaval real)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "viga l�petaval real\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "ei leia OpenPGP andmeid.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "pole inimese poolt loetav"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1554,84 -1231,73 +1574,95 @@@ msgstr "
"noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
"ning l�pus peab olema '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
+ "ning l�pus peab olema '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "pole inimese poolt loetav"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Sisestage parool: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "See k�sklus ei ole %s moodis lubatud.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Teie valik? "
@@@ -1698,21 -1350,11 +1729,16 @@@ msgstr "vastavat avalikku v�tit pole: %
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
@@@ -1810,13 -1433,10 +1836,13 @@@ msgstr "Millist v�tmepikkust te soovite
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "�mardatud �les %u bitini\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1871,9 -1481,6 +1897,9 @@@ msgstr " (%d) RSA (ainult kr�pteerimi
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Vigane valik.\n"
@@@ -1907,7 -1508,6 +1933,7 @@@ msgstr "Allkirjastan t�esti?
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "v�lju sellest men��st"
@@@ -1916,7 -1515,6 +1942,7 @@@
msgid "show admin commands"
msgstr "vastuolulised k�sud\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "n�ita seda abiinfot"
@@@ -2000,132 -1580,102 +2026,132 @@@ msgstr "vastuolulised k�sud\n
msgid "Admin commands are not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Vigane k�sklus (proovige \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "`%s' ei �nnestu avada\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "viga v�tmebloki lugemisel: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
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:136
++#: g10/delkey.c:135
#, 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:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Kustutan selle v�tme v�tmehoidlast? "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "See on salajane v�ti! - kas kustutan t�esti? "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "key"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Avalik v�ti: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "omaniku usalduse info puhastatud\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "S2K moodi t�ttu ei saa s�mmeetrilist ESK paketti kasutada\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "kasutan �iffrit %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' on juba pakitud\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "HOIATUS: `%s' on t�hi fail\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "loen failist `%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2133,38 -1683,31 +2159,38 @@@
msgstr ""
"pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "%s ei ole moodis %s lubatud.\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "%s ei ole moodis %s lubatud.\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s kr�pteeritud andmed\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �ifri n�rga v�tmega.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "probleem kr�ptitud paketi k�sitlemisel\n"
@@@ -2226,142 -1758,114 +2252,142 @@@ 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:79
++#: g10/export.c:78
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
"`%s' jaoks pole t�histamise v�tmeid\n"
"\n"
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "mittekasutatav salajane v�ti"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: j�tsin vahele: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[Kasutaja id puudub]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "n�ita s�rmej�lge"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "salajast v�tit `%s' ei leitud: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "loo eraldiseisev allkiri"
@@@ -2371,11 -1874,9 +2397,11 @@@
msgid "make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "kr�pteeri andmed"
@@@ -2383,15 -1883,12 +2409,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekr�pteeri andmed (vaikimisi)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "kontrolli allkirja"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "n�ita v�tmeid"
@@@ -2404,15 -1899,12 +2430,15 @@@ msgstr "n�ita v�tmeid ja allkirju
msgid "list and check key signatures"
msgstr "kontrolli v�tmete allkirju"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "n�ita v�tmeid ja s�rmej�lgi"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "n�ita salajasi v�tmeid"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genereeri uus v�tmepaar"
@@@ -2436,7 -1924,6 +2462,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "genereeri t�histamise sertifikaat"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "eemalda v�tmed avalike v�tmete hoidlast"
@@@ -2468,7 -1949,6 +2494,7 @@@ msgstr "allkirjasta v�ti lokaalselt
msgid "sign or edit a key"
msgstr "allkirjasta v�i toimeta v�tit"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "muuda parooli"
@@@ -2518,24 -1987,19 +2544,24 @@@ msgstr "uuenda usalduse andmebaasi
msgid "print message digests"
msgstr "|algo [failid]|tr�ki teatel�hendid"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "loo ascii pakendis v�ljund"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|kr�pti NIMEle"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
@@@ -2549,12 -2011,10 +2575,12 @@@ msgstr "|N|m��ra pakkimise tase N (0 bl
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "�ra tee mingeid muutusi"
@@@ -2566,7 -2024,6 +2592,7 @@@ msgstr "k�si enne �lekirjutamist
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2574,7 -2031,6 +2600,7 @@@ msgstr "
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2594,13 -2050,11 +2620,13 @@@ msgstr "
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2615,7 -2069,6 +2641,7 @@@ msgstr "
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2623,600 -2076,471 +2649,600 @@@ msgstr "
"\n"
"Toetatud algoritmid:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Avalik v�ti: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "�iffer: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "R�si: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Pakkimine: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "kasuta: gpg [v�tmed] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "vastuolulised k�sud\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1537
#, 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:1537
++#: g10/gpg.c:1540
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1546
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1549
#, 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:1549
++#: g10/gpg.c:1552
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tundmatu seade \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "blokeeri v�ti"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku �ifri eelistused\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku l�hendi eelistused\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei t��ta veel koos %s-ga\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [failinimi]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key kasutaja-id"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[failinimi]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
@@@ -3230,7 -2552,6 +3256,7 @@@ msgstr "v�ta v�tmed sellest v�tmehoidla
msgid "make timestamp conflicts only a warning"
msgstr "teata ajatemplite konfliktist ainult hoiatusega"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
@@@ -3257,327 -2574,261 +3283,327 @@@ msgstr "Abiinfo puudub
msgid "No help available for '%s'"
msgstr "`%s' kohta abiinfo puudub"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "uuenda usalduse andmebaasi"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "uuenda usalduse andmebaasi"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "mittekasutatav salajane v�ti"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "j�tan bloki t��biga %d vahele\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu v�tit on seni t��deldud\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "T��deldud kokku: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " vahele j�etud uusi v�tmeid: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " vahele j�etud uusi v�tmeid: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " puudub kasutaja ID: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " imporditud: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " muutmata: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusi kasutajaid: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusi alamv�tmeid: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusi allkirju: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusi t�histamisi: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " loetud salajasi v�tmeid: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " salajasi v�tmeid imporditud: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muutmata salajasi v�tmeid: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " pole imporditud: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " uusi allkirju: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " loetud salajasi v�tmeid: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "`%s' j�tsin vahele: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, 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:1135
++#: g10/import.c:1134
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, 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:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, 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:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "salajast v�tit `%s' ei leitud: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3592,198 -2843,176 +3618,218 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "v�ti %08lX: vigane alamv�tme seos\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, 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:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "v�tmehoidla `%s' on loodud\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "v�tmehoidla `%s' on loodud\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[t�histamine]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[iseenda allkiri]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d halba allkirja\n"
- msgstr[1] "%d halba allkirja\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "Korrektne allkiri kasutajalt \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "`%s' j�tsin vahele: %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Kasutaja ID \"%s\" on t�histatud."
+ msgstr[1] "Kasutaja ID \"%s\" on t�histatud."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3791,23 -3020,25 +3837,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 allkiri j�i testimata, kuna v�ti puudub\n"
msgstr[1] "1 allkiri j�i testimata, kuna v�ti puudub\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 allkiri j�i vea t�ttu kontrollimata\n"
- msgstr[1] "1 allkiri j�i vea t�ttu kontrollimata\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d halba allkirja\n"
+ msgstr[1] "%d halba allkirja\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
- msgstr[1] "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Korrektne allkiri kasutajalt \""
+ msgstr[1] "Korrektne allkiri kasutajalt \""
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3820,68 -3051,53 +3872,68 @@@ msgstr "
"passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Usaldan v�hesel m��ral\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Usaldan t�iesti\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kasutaja ID \"%s\" on t�histatud."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Ei saa allkirjastada.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kasutaja ID \"%s\" on aegunud."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Allkirjastan t�esti? "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3890,11 -3106,9 +3942,11 @@@ msgstr "
"Iseenda allkiri \"%s\"\n"
"on PGP 2.x stiilis allkiri.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3903,11 -3117,9 +3955,11 @@@ msgstr "
"Teie praegune allkiri \"%s\"\n"
"on aegunud.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3916,44 -3128,35 +3968,44 @@@ msgstr "
"Teie praegune allkiri \"%s\"\n"
"on lokaalne allkiri.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "V�tmega %08lX pole midagi allkirjastada\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "See v�ti on aegunud!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "See v�ti aegub %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3963,32 -3166,26 +4015,32 @@@ msgstr "
"kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
"sisestage \"0\".\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ma ei vasta.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ma ei ole �ldse kontrollinud.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3997,269 -3194,211 +4049,265 @@@ msgstr "
"Olete t�esti kindel, et soovite seda v�tit oma\n"
"v�tmega allkirjastada: \""
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"See saab olema iseenda allkiri.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, 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:1010
++#: g10/keyedit.c:1523
#, 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:1020
++#: g10/keyedit.c:1533
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Allkiri m�rgitakse mitte-eksporditavaks.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
#, 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:1039
++#: g10/keyedit.c:1552
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
#, 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:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Allkirjastan t�esti? "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "t�stan v�tme allkirja �igesse kohta\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "salvesta ja v�lju"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "n�ita s�rmej�lge"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Allkirja noteerimine: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "n�ita v�tit ja kasutaja IDd"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "vali kasutaja ID N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "vali kasutaja ID N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "t�hista allkirjad"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "allkirjasta v�ti lokaalselt"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "lisa kasutaja ID"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "lisa foto ID"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "kustuta kasutaja ID"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "kustuta sekundaarne v�ti"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "lisa t�histamise v�ti"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
#, 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:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "m�rgi kasutaja ID primaarseks"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "n�ita eelistusi (ekspert)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "n�ita eelistusi (detailsena)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "muuda parooli"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "muuda omaniku usaldust"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "t�hista kasutaja ID"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "t�hista sekundaarne v�ti"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "luba v�ti"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "blokeeri v�ti"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "n�ita foto ID"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Salajane v�ti on kasutatav.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4267,267 -3406,215 +4315,273 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "V�ti on t�histatud."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "tundmatu allkirja klass"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Kas eemaldan t�esti selle kasutaja ID? "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "`%s' ei �nnestu avada: %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, 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:2031
++#: g10/keyedit.c:2497
#, 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:2069
++#: g10/keyedit.c:2535
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Kas t�histan t�esti selle kasutaja ID? "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, 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:2099
++#: g10/keyedit.c:2565
#, 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:2101
++#: g10/keyedit.c:2567
#, 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:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "sea eelistuste nimekiri"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, 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:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Kas t�esti uuendan seaded? "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Salvestan muutused? "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "V�ljun salvestamata? "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "viga: vigane s�rmej�lg\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "vigane v��rtus\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Tundmatu kasutaja ID.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "V�tmega %08lX pole midagi allkirjastada\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Teatel�hend: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Omadused: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Noteering: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr " (tundlik)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s ei �nnestu luua: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[t�histatud] "
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [aegub: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [aegub: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, fuzzy, c-format
msgid "usage: %s"
msgstr " usaldus: %c/%c"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " usaldus: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "See v�ti on blokeeritud"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4535,19 -3622,14 +4589,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[t�histatud] "
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4555,17 -3637,14 +4609,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4574,35 -3653,27 +4628,35 @@@ msgstr "
"HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
" PGP versioone seda v�tit tagasi l�kkama.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Kustutan selle vigase allkirja? (j/E/v)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4610,38 -3681,31 +4664,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Kustutatud %d allkiri.\n"
msgstr[1] "Kustutatud %d allkiri.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Midagi ei kustutatud.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
#, fuzzy
msgid "invalid"
msgstr "vigane pakend"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Kasutaja ID \"%s\" on t�histatud."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Kasutaja ID \"%s\" on t�histatud."
msgstr[1] "Kasutaja ID \"%s\" on t�histatud."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4650,39 -3714,31 +4704,39 @@@ msgstr "
"HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
" p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
#, 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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
#, 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:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4690,234 -3746,184 +4744,234 @@@
msgstr ""
"Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Muudan primaarse v�tme aegumise aega.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Allkirja noteerimine: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Kirjutan �le (j/E)? "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "kasutaja ID: \""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " allkirjastanud %08lX %s%s%s\n"
- #: g10/keyedit.c:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (mitte-eksporditav)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "See allkiri aegub %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
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:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
#, fuzzy
msgid "Not signed by you.\n"
msgstr " allkirjastanud %08lX %s%s\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr " (mitte-eksporditav)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " t�histanud %08lX %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Te asute t�histama j�rgmisi allkirju:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "salajast v�tit pole\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "eelistus %c%lu on duplikaat\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "lubamatu s�mbol eelistuste s�nes\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "kirjutan otsese allkirja\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "kirjutan iseenda allkirja\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "kirjutan v�tit siduva allkirja\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "vigane v�tme suurus; kasutan %u bitti\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "v�tme suurus �mardatud �les %u bitini\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "kr�pteeri andmed"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -4931,157 -3937,126 +4985,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (ainult kr�ptimiseks)\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (ainult allkirjastamiseks)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (ainult kr�ptimiseks)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Allkirja noteerimine: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Soovitud v�tmepikkus on %u bitti\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "�mardatud �les %u bitini\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5097,7 -4072,6 +5151,7 @@@ msgstr "
" <n>m = v�ti aegub n kuuga\n"
" <n>y = v�ti aegub n aastaga\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5113,40 -4087,32 +5167,40 @@@ msgstr "
" <n>m = allkiri aegub n kuuga\n"
" <n>y = allkiri aegub n aastaga\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "V�ti on kehtiv kuni? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Allkiri on kehtiv kuni? (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "vigane v��rtus\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s ei aegu kunagi\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s ei aegu kunagi\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s aegub %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Allkiri aegub %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5154,12 -4120,10 +5208,12 @@@ msgstr "
"Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
"Siiski k�sitletakse neid korrektselt aastani 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "On see �ige (j/e)? "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5170,7 -4134,6 +5224,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5186,50 -4149,39 +5240,50 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "P�risnimi: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Lubamatu s�mbol nimes\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Nimi ei v�i alata numbriga\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "E-posti aadress: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Kommentaar: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Lubamatu s�mbol kommentaaris\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5240,7 -4192,6 +5294,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5255,35 -4206,28 +5309,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoVv"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Palun parandage k�igepealt viga\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5295,12 -4239,10 +5349,12 @@@ msgstr "
"kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
"koguda paremat entroopiat.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5308,66 -4250,53 +5362,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' on juba pakitud\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Kasutan seda v�tit ikka? "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
msgid "creating anyway\n"
msgstr "genereeri uus v�tmepaar"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "V�tme genereerimine katkestati.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5377,63 -4306,50 +5431,63 @@@ msgstr "
"Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
"kasutades v�tit \"--edit-key\".\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, 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:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, 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:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
#, 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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Loon t�esti? "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "mitte kunagi"
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Kriitiline allkirja poliitika: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Allkirja poliitika: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Kriitiline allkirja noteerimine: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Allkirja noteerimine: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5441,69 -4357,63 +5495,77 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d halba allkirja\n"
msgstr[1] "%d halba allkirja\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 allkiri j�i vea t�ttu kontrollimata\n"
+ msgstr[1] "1 allkiri j�i vea t�ttu kontrollimata\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "V�tmehoidla"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "`%s' j�tsin vahele: %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Primaarse v�tme s�rmej�lg:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Primaarse v�tme s�rmej�lg:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Alamv�tme s�rmej�lg:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " V�tme s�rmej�lg ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrollin v�tmehoidlat `%s'\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "kontrollitud %lu v�tit (%lu allkirja)\n"
msgstr[1] "kontrollitud %lu v�tit (%lu allkirja)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5511,526 -4421,419 +5573,526 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 halb allkiri\n"
msgstr[1] "1 halb allkiri\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: v�tmehoidla on loodud\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "k�sin v�tit %08lX v�tmeserverist %s\n"
msgstr[1] "k�sin v�tit %08lX v�tmeserverist %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allkirjastatud teie v�tmega %08lX %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s kr�pteeritud sessiooni v�ti\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "avalik v�ti on %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ka \""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "kr�pteeritud kasutades %lu parooli\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "kr�pteeritud �he parooliga\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "eeldan %s kr�pteeritud andmeid\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "lahtikr�pteerimine �nnestus\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "algne failinimi on='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "HALB allkiri kasutajalt \""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Aegunud allkiri kasutajalt \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "allkirja kontroll j�eti �ra\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "neid allkirju ei �nnestu t��delda\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allkiri aegus %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ka \""
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "V�tme leiate: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[ebakindel]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ka \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Allkiri aegus %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Allkiri aegub %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binaarne"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "tekstimood"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "tundmatu"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "tundmatu avaliku v�tme algoritm"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allkirja ei saa kontrollida: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "ei ole eraldiseisev allkiri\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "vana stiili (PGP 2.x) allkiri\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "faili ei �nnestu avada: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
#, 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:302
++#: g10/misc.c:300
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "realiseerimata �ifri algoritm"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, 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:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "viga lugemisel: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "viga lugemisel: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "palun kasutage selle asemel \"%s%s\"\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Pakkimata"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "Pakkimata"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "tundmatu allkirja klass"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Fail `%s' on olemas. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Kirjutan �le (j/E)? "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: tundmatu suffiks\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Sisestage uus failinimi"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "kirjutan standardv�ljundisse\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "uus omaduste fail `%s' on loodud\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
"v�ti\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "probleem agendiga: agent tagastas 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (peamise v�tme ID %08lX)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6043,15 -4846,12 +6105,15 @@@ msgstr "
"\"%.*s\"\n"
"%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Sisestage parool\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "katkestatud kasutaja poolt\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6061,47 -4861,38 +6123,47 @@@ msgstr "
"Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
"parooli: \""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Palun sisestage parool; see on salajane tekst \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6157,31 -4940,24 +6219,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "P�hjus puudub"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "V�ti on asendatud"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "V�ti on kompromiteeritud"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "V�ti ei ole enam kasutusel"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "Kasutaja ID ei ole enam kehtiv"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "t�histamise p�hjus: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "t�histamise kommentaar: "
@@@ -6195,98 -4971,79 +6257,98 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iItTvVjJ"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Usalduse v��rtus puudub:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " ka \""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, 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:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Ei tea\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = EI usalda\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Usaldan absoluutselt\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " t = tagasi p�himen��sse\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " j = j�ta see v�ti vahele\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " v = v�lju\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Teie otsus? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, 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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Sertifikaadid t�iesti usaldatava v�tmeni:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "See v�ti kuulub meile\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6298,130 -5055,102 +6360,130 @@@ msgstr "
"v�ite j�rgnevale k�simusele vastata jaatavalt\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Kasutan seda v�tit ikka? "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
#, 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:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "M�rkus: See v�ti on blokeeritud.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "M�rkus: See v�ti on aegunud!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Allkiri on t�en�oliselt V�LTSING.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: j�tsin vahele: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, 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:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6429,169 -5158,133 +6491,169 @@@ msgstr "
"\n"
"Sisestage kasutaja ID. L�petage t�hja reaga: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Tundmatu kasutaja ID.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Avalik v�ti on blokeeritud.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "kehtivaid aadresse pole\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Eraldiseisev allkiri.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Palun sisestage andmefaili nimi: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "loen standardsisendit ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "allkirjastatud andmeid pole\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "ok, me oleme anon��mne teate saaja.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "vana DEK kodeerimine ei ole toetatud\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "�ifri algoritm %d%s on tundmatu v�i blokeeritud\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet eba�nnestus: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "T�histaja:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(See on tundlik t�histamise v�ti)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, 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
++#: g10/revoke.c:327
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet eba�nnestus: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "T�histamise sertifikaat on loodud.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
"`%s' jaoks pole t�histamise v�tmeid\n"
"\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6600,20 -5293,17 +6662,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "T�histamise sertifikaat on loodud.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "salajast v�tit `%s' ei leitud: %s\n"
@@@ -6621,23 -5311,19 +6683,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6658,92 -5344,74 +6720,92 @@@ msgstr "
"tr�kis�steem\n"
"v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Palun valige t�histamise p�hjus:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Katkesta"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(T�en�oliselt soovite siin valida %d)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "T�histamise p�hjus: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Kirjeldust ei antud)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "On see h�sti? "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "loodi n�rk v�ti - proovin uuesti\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin "
"%d korda!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "HOIATUS: allkirja l�hend on teatega konfliktne\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = esita palun t�iendavat infot\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
msgstr[1] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
msgstr[1] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6752,7 -5420,6 +6814,7 @@@ msgid_plural "
msgstr[0] "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
msgstr[1] "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6760,39 -5427,32 +6822,39 @@@
msgstr[0] "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
msgstr[1] "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "M�RKUS: v�ti on t�histatud"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"HOIATUS: noteerimise %%-asendus eba�nnestus (liiga suur). Kasutan "
"kompaktset.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6800,7 -5460,6 +6862,7 @@@ msgstr "
"HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
"kompaktset.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6809,54 -5468,44 +6871,54 @@@ msgstr "
"HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
"kompaktset.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s allkiri kasutajalt: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "allkirjastan:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "kasutatakse %s kr�pteerimist\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "`%s' j�tsin vahele: duplikaat\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6865,340 -5514,274 +6927,340 @@@ msgstr "
"# Omistatud usalduse v��rtuste loend, loodud: %s\n"
"# (Taastamiseks kasutage \"gpg --import-ownertrust\")\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "rida on liiga pikk\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "viga: vigane s�rmej�lg\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr "impordi usalduse v��rtused"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "viga usalduse kirje otsimisel: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "viga lugemisel: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync eba�nnestus: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "`%s' ei �nnestu avada\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, 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
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "trustdb transaktsioon on liiga suur\n"
- #: 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"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: kataloogi ei ole!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, fuzzy, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "`%s' ei �nnestu sulgeda: %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: versioonikirje loomine ei �nnestu: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: loodi vigane usalduse andmebaas\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trustdb on loodud\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "M�RKUS: trustdb pole kirjutatav\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: vigane trustdb\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: viga versioonikirje uuendamisel: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: viga versioonikirje lugemisel: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek eba�nnestus: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ei ole trustdb fail\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versioonikirje kirje numbriga %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: vigane faili versioon %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: viga vaba kirje lugemisel: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: kirje nullimine eba�nnestus: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: kirje lisamine eba�nnestus: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: trustdb on loodud\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "sisendrida on pikem, kui %d s�mbolit\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Toetatud algoritmid:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "ei leia avalikku v�tit %08lX: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Poliis: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "n�ita v�tmeid"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [failid]|tr�ki teatel�hendid"
msgstr[1] "|algo [failid]|tr�ki teatel�hendid"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7208,173 -5791,153 +7270,184 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [failid]|tr�ki teatel�hendid"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7383,7 -5945,6 +7456,7 @@@
msgid "no need for a trustdb check\n"
msgstr "trustdb kontrolliks puudub vajadus\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "trustdb j�rgmine kontroll %s\n"
@@@ -7430,35 -5983,28 +7503,35 @@@ msgstr "absoluutselt usaldatavaid v�tme
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, 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"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
#, fuzzy
msgid "never"
msgstr "mitte kunagi"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7470,42 -6016,33 +7543,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "[t�histatud] "
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "[aegunud] "
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "tundmatu"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7515,12 -6052,10 +7588,12 @@@ msgstr "
"Palun pidage meeles, et allkirja fail (.sig v�i .asc)\n"
"peab olema k�sureal esimene fail.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "`%s' ei �nnestu avada: %s\n"
@@@ -7849,7 -6316,6 +7922,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7994,9 -6430,6 +8067,9 @@@ msgstr "viga parooli loomisel: %s\n
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
@@@ -8504,7 -6832,6 +8577,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "viga v�tmebloki lugemisel: %s\n"
@@@ -8529,134 -6852,104 +8602,134 @@@ msgstr "v�tmebloki kustutamine eba�nnes
msgid "no valid recipients given\n"
msgstr "(Kirjeldust ei antud)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "n�ita salajasi v�tmeid"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "halb sertifikaat"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "halb sertifikaat"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "halb sertifikaat"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "loo ascii pakendis v�ljund"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "�ra kasuta terminali"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "pakettmood: �ra k�si kunagi"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "eelda enamus k�simustele jah vastust"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "eelda enamus k�simustele ei vastust"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|kasuta seda v�tmeserverit"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8667,47 -6960,38 +8740,47 @@@ msgstr "
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Kirjeldust ei antud)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " j = j�ta see v�ti vahele\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "kirjutan faili `%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "`%s' ei �nnestu sulgeda: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8725,7 -7006,6 +8798,7 @@@ msgstr "genereeri t�histamise sertifika
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "viga parooli loomisel: %s\n"
@@@ -8740,32 -7018,26 +8813,32 @@@ msgstr "viga parooli loomisel: %s\n
msgid "error reading input: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -8944,7 -7183,6 +9017,7 @@@ msgstr "halb sertifikaat
msgid " runtime cached certificates: %u\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "T�histamise sertifikaat on loodud.\n"
@@@ -8954,8 -7191,6 +9027,8 @@@
msgid "certificate cached\n"
msgstr "eelistus %c%lu on duplikaat\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "viga parooli loomisel: %s\n"
@@@ -9562,13 -7674,11 +9635,13 @@@ msgstr "halb sertifikaat
msgid "force the use of the default OCSP responder"
msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9576,85 -7686,69 +9649,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "eelistus %c%lu on duplikaat\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "M�RKUS: v�ti on t�histatud"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Toetatud algoritmid:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9809,12 -7869,10 +9882,12 @@@ msgstr "kasuta: gpg [v�tmed]
msgid "colons are not allowed in the socket name\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
@@@ -10309,77 -8265,61 +10382,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/fi.po
index 7a4c04c,48b8b2e..15d415a
--- a/po/fi.po
+++ b/po/fi.po
@@@ -22,7 -22,6 +22,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
"Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@@ -114,8 -98,6 +114,8 @@@ msgstr "Ole hyvä ja syötä salasana,
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "väärä salasana"
@@@ -171,25 -142,11 +171,25 @@@ msgstr "väärä salasana
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -398,8 -316,6 +398,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muuta salasanaa"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -409,118 -325,87 +409,118 @@@ msgstr "
"Valitsimet:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "monisanainen"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ole jonkinverran hiljaisempi"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "etsi avaimia avainpalvelimelta"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "päivitä luottamustietokanta"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ei tuettu"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -529,165 -414,125 +529,170 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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 ""
"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs at gnu.org>.\n"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: hakemisto luotu\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
+
++#: agent/gpg-agent.c:1964
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: hakemistoa ei voi luoda: %s\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ohitettu: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -703,8 -546,6 +708,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -712,9 -553,6 +717,9 @@@ msgstr "
"@Komennot:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -724,46 -562,38 +729,46 @@@ msgstr "
"Valitsimet:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "Peru"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -827,8 -647,6 +832,8 @@@ msgstr "
msgid "Yes"
msgstr "kyllä|kylla|joo"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -858,46 -673,38 +863,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "muuta salasanaa"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Haluatko varmasti poistaa valitut avaimet? "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "ota avain käyttöön"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -938,53 -738,42 +943,57 @@@ msgstr "suojausalgoritmi %d%s ei ole k�
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "päivitys epäonnistui: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -999,17 -786,18 +1008,22 @@@ msgstr "gpg-agentin kanssa yhteysongelm
msgid "problem setting the gpg-agent options\n"
msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "käyttäjän peruma\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "core-tiedostojen luontia ei voi estää: %s\n"
@@@ -1080,17 -854,18 +1094,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, fuzzy, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1418,7 -1126,6 +1437,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "ei käsitelty"
@@@ -1428,22 -1134,14 +1447,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "ei voi avata tiedostoa: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@@ -1482,82 -1173,64 +1496,82 @@@ msgstr "julkista avainta %08lX ei löyd
msgid "waiting for lock %s...\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "ascii-koodaus: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "epäkelpo ascii-koodausotsake: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "ascii-koodausotsake: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "ascii-koodausotsake: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "odottamaton ascii-koodaus:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "epäkelpo viiva rivin lopussa: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "väärinmuotoiltu CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-virhe; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "virhe trailer-rivissä\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@@ -1565,7 -1238,11 +1579,13 @@@
"viallista\n"
"MTA:ta on käytetty\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "ei ihmisten luettavissa"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1573,84 -1250,73 +1593,95 @@@ msgstr "
"notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
"välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
+ "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "ei ihmisten luettavissa"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Syötä salasana: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Valintasi? "
@@@ -1717,21 -1369,11 +1748,16 @@@ msgstr "ei vastaavaa julkista avainta:
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
@@@ -1829,13 -1452,10 +1855,13 @@@ msgstr "Minkä kokoisen avaimen haluat
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "pyöristetty %u bittiin\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1890,9 -1500,6 +1916,9 @@@ msgstr " (%d) RSA (vain salaus)\n
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Valinta ei kelpaa.\n"
@@@ -1926,7 -1527,6 +1952,7 @@@ msgstr "Varmastiko allekirjoita?
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "ulos tästä valikosta"
@@@ -1935,7 -1534,6 +1961,7 @@@
msgid "show admin commands"
msgstr "ristiriitainen komento\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "näytä tämä ohje"
@@@ -2019,170 -1599,133 +2045,170 @@@ msgstr "ristiriitainen komento\n
msgid "Admin commands are not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(ellet määritä avainta sormenjäljen perusteella)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
#, fuzzy
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "ei onnistu eräajossa ilman \"--yes\"-valitsinta\n"
- #: g10/delkey.c:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Poista tämä avain avainrenkaasta? "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Tämä on salainen avain! - poista varmasti? "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "key"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "JulkAvain: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "luottamustiedot pyyhitty\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "käytetään salakirjoitusalgoritmia %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "\"%s\" on jo pakattu\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "luetaan kohteesta \"%s\"\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s salattua dataa\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "salattu tuntemattomalla algoritmilla %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"VAROITUS: viesti salattiin symmetrisessä salaimessa \n"
"esiintyvällä heikolla avaimella.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "ongelma käsiteltäessä salattua pakettia\n"
@@@ -2243,140 -1775,112 +2269,140 @@@ 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:79
++#: g10/export.c:78
#, 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:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "salaista avainta ei voi käyttää"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ohitettu: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "VAROITUS: mitään ei viety\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[Käyttäjätunnusta ei löytynyt]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "näytä sormenjälki"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "salaista avainta \"%s\" ei löydy: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "tee erillinen allekirjoitus"
@@@ -2386,11 -1889,9 +2412,11 @@@
msgid "make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "salaa tiedot"
@@@ -2398,15 -1898,12 +2424,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "salaa vain symmetrisellä salaimella"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "avaa tiedot (oletus)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "tarkista allekirjoitus"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "näytä avaimet"
@@@ -2419,15 -1914,12 +2445,15 @@@ msgstr "näytä avaimet allekirjoituksi
msgid "list and check key signatures"
msgstr "tarkista avainten allekirjoitukset"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "näytä avaimet sormenjälkineen"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "näytä salaiset avaimet"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "luo uusi avainpari"
@@@ -2451,7 -1939,6 +2477,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "luo mitätöintivarmenne"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "poista avaimet julkisten avainten renkaasta"
@@@ -2483,7 -1964,6 +2509,7 @@@ msgstr "allekirjoita avain paikallisest
msgid "sign or edit a key"
msgstr "allekirjoita tai muokkaa avainta"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "muuta salasanaa"
@@@ -2533,24 -2002,19 +2559,24 @@@ msgstr "päivitä luottamustietokanta
msgid "print message digests"
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "tuota ascii-koodattu tuloste"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
@@@ -2564,12 -2026,10 +2590,12 @@@ msgstr "|N|aseta pakkausaste N (0 poist
msgid "use canonical text mode"
msgstr "käytä tekstimuotoa"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "älä tee muutoksia"
@@@ -2581,7 -2039,6 +2607,7 @@@ msgstr "kysy ennen ylikirjoittamista
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2590,7 -2047,6 +2616,7 @@@ msgstr "
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2609,13 -2065,11 +2635,13 @@@ msgstr "
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2630,7 -2084,6 +2656,7 @@@ msgstr "
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2638,601 -2091,472 +2664,601 @@@ msgstr "
"\n"
"Tuetut algoritmit:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "JulkAvain: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Salaus: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Tiiviste: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Pakkaus: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "käyttö: gpg [valitsimet] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, 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:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, 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:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tuntematon asetus \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "poista avain käytöstä"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed täytyy olla suurempi kuin 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "virheelliset oletusarvoiset valinnat\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [tiedostonimi]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [tiedostonimi]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [tiedostonimi]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--allekirjoita [tiedostonimi]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [tiedostonimi]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [tiedostonimi]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [tiedostonimi]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key käyttäjätunnus"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key käyttäjätunnus"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key käyttäjätunnus [komennot]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key käyttäjätunnus"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ascii-koodauksen purku epäonnistui: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[tiedostonimi]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Kirjoita viestisi...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "annettu varmennekäytännön URL on virheellinen\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@@ -3246,7 -2568,6 +3272,7 @@@ msgstr "ota avaimet tästä avainrenkaa
msgid "make timestamp conflicts only a warning"
msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
@@@ -3273,328 -2590,262 +3299,328 @@@ msgstr "Ei ohjeita saatavilla
msgid "No help available for '%s'"
msgstr "Ei ohjetta aiheesta \"%s\""
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "päivitä luottamustietokanta"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "päivitä luottamustietokanta"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "salaista avainta ei voi käyttää"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "ohitetaan tyypin %d lohko\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "tähän mennessä käsitelty %lu avainta\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Kaikkiaan käsitelty: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ohitetaan uudet avaimet: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ohitetaan uudet avaimet: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ilman käyttäjätunnuksia: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " tuotu: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " muuttamatonta: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusia käyttäjätunnuksia: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusia aliavaimia: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusia allekirjoituksia: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusia avainten mitätöintejä: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " luettuja salaisia avaimia: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tuotuja salaisia avaimia: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muuttamattomia salaisia avaimia: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ei tuotu: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " uusia allekirjoituksia: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " luettuja salaisia avaimia: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ohitetaan \"%s\": %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "avain %08lX: uusi avain - ohitetaan\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, 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:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, 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:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "avain %08lX: \"%s\" ei muutoksia\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "avain %08lX: salainen avain tuotu\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "salaista avainta \"%s\" ei löydy: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3609,200 -2860,179 +3635,221 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "avain %08lX: käyttäjätunnus ohitettu '"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "avain %08lX: aliavain ohitettu\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "avainrengas \"%s\" luotu\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "avainrengas \"%s\" luotu\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[mitätöinti]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[oma-allekirjoitus]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d väärää allekirjoitusta\n"
- msgstr[1] "%d väärää allekirjoitusta\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
+ # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "Allekirjoitus täsmää lähettäjään \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "ohitetaan \"%s\": %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
+ msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3810,25 -3040,25 +3857,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
msgstr[1] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
- msgstr[1] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d väärää allekirjoitusta\n"
+ msgstr[1] "%d väärää allekirjoitusta\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] ""
- "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
- msgstr[1] ""
- "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Allekirjoitus täsmää lähettäjään \""
+ msgstr[1] "Allekirjoitus täsmää lähettäjään \""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
+
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3841,68 -3071,53 +3892,68 @@@ msgstr "
"lähteistä...)?\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Luotan osittain\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Luotan täysin\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Allekirjoittaminen ei onnistu.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3911,13 -3126,11 +3962,13 @@@ msgstr "
"Oma-allekirjoitus kohteessa \"%s\"\n"
"on PGP 2.x -muodon allekirjoitus.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3926,11 -3139,9 +3977,11 @@@ msgstr "
"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
"on vanhentunut.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3939,44 -3150,35 +3990,44 @@@ msgstr "
"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
"on paikallinen allekirjoitus.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, 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:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Tämä avain on vanhentunut!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Avain vanhenee %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3985,32 -3187,26 +4036,32 @@@ msgstr "
"Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
"Jos et tiedä vastausta, syötä \"0\".\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) En vastaa.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) En ole tarkistanut lainkaan.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Olen suorittanut arkisen tarkistuksen.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4019,269 -3215,211 +4070,265 @@@ msgstr "
"Haluatko varmasti allekirjoittaa tämän avaimen\n"
"omalla avaimellasi: \""
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Tämä tulee olemaan oma-allekirjoitus.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, 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:1010
++#: g10/keyedit.c:1523
#, 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:1020
++#: g10/keyedit.c:1533
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
#, 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:1034
++#: g10/keyedit.c:1547
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"En ole tarkistanut tätä avainta lainkaan.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Olen tarkistanut avaimen arkisesti.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Olen tarkistanut avaimen erittäin huolellisesti.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "tallenna ja lopeta"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "näytä sormenjälki"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Allekirjoitusnotaatio: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "näytä avaimet ja käyttäjätunnukset"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "valitse käyttäjätunnus N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "valitse käyttäjätunnus N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "mitätöi allekirjoitus"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "lisää käyttäjätunnus"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "lisää valokuva"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "poista käyttäjätunnus"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "poista toissijainen avain"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "lisää mitätöintiavain"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "merkitse käyttäjätunnus ensisijaiseksi"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "näytä valinnat (asiantuntija)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "näytä valinnat (monisanaisesti)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "muuta salasanaa"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "muuta luottamusastetta"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "mitätöi käyttäjätunnus"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "mitätöi toissijainen avain"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "ota avain käyttöön"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "poista avain käytöstä"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "näytä valokuvatunniste"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Salainen avain on saatavilla.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Tähän tarvitaan salainen avain.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4289,267 -3427,215 +4336,273 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Avain on mitätöity."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "tuntematon allekirjoitusluokka"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
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:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Varmastiko poista tämä käyttäjätunnus? "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Sinun täytyy valita ainakin yksi avain.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Sinun täytyy valita ainakin yksi avain.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Haluatko varmasti poistaa valitut avaimet? "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Haluatko varmasti poistaa tämän avaimen? "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, 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:2099
++#: g10/keyedit.c:2565
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
#, 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:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "näytä valinnat"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, 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:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Varmastiko päivitä valinnat? "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Tallenna muutokset? "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Lopeta tallentamatta muutoksia?"
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "arvo ei kelpaa\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Käyttäjätunnusta ei löydy.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Tiiviste: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Ominaisuudet: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Notaatio: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr " (luottamuksellinen)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[mitätöity] "
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [vanhenee: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [vanhenee: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, fuzzy, c-format
msgid "usage: %s"
msgstr " luottamus: %c/%c"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " luottamus: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Tämä avain on poistettu käytöstä"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4557,19 -3643,14 +4610,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[mitätöity] "
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4577,17 -3658,14 +4630,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4596,35 -3674,27 +4649,35 @@@ msgstr "
"VAROITUS: Tämä on PGP2-muodon avain. Valokuvan lisääminen voi\n"
" saada jotkin PGP:n versiot hylkäämään avaimen.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4632,38 -3702,31 +4685,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d allekirjoitus poistettu.\n"
msgstr[1] "%d allekirjoitus poistettu.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Mitään ei poistettu.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
#, fuzzy
msgid "invalid"
msgstr "virheellinen ascii-koodaus"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, 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:3783
++#: g10/keyedit.c:4302
#, 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:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4673,39 -3736,31 +4726,39 @@@ msgstr "
"voi\n"
" saada jotkin PGP:n versiot hylkäämään avaimen.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
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:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
#, 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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
#, 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:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4713,238 -3768,188 +4766,238 @@@
msgstr ""
"Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Valitse tasan yksi käyttäjätunnus!\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Allekirjoitusnotaatio: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ylikirjoita (k/E)? "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, 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:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "käyttäjätunnus: \""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (vientiin kelpaamaton)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Tämä allekirjoitus vanheni %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
#, fuzzy
msgid "Not signed by you.\n"
msgstr " %08lX allekirjoitti tämän %s%s\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr " (vientiin kelpaamaton)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, 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:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "salainen avain ei ole saatavilla\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, 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:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, 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:5571
++#: g10/keyedit.c:6195
#, 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:5668
++#: g10/keyedit.c:6292
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
"(käyttäjätunnus %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "valinta %c%lu on kopio\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "liian monta \"%c\" valintaa\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "liian monta \"%c\" valintaa\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "liian monta \"%c\" valintaa\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "Valinnassa on luvaton merkki\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "kirjoitetaan suora allekirjoitus\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "kirjoitetaan oma-allekirjoitus\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "avaimen koko on pyöristetty %u bittiin\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "salaa tiedot"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -4958,157 -3963,126 +5011,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (vain salaus)\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Valitse millaisen avaimen haluat:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA ja ElGamal (oletus)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA ja ElGamal (oletus)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (vain allekirjoitus)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (vain allekirjoitus)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (vain salaus)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA ja ElGamal (oletus)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (vain allekirjoitus)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Allekirjoitusnotaatio: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Halutun avaimen koko on %u bittiä\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "pyöristetty %u bittiin\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Valitse millaisen avaimen haluat:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5124,7 -4098,6 +5177,7 @@@ msgstr "
" <n>m = Avain vanhenee n kuukauden kuluttua\n"
" <n>y = Avain vanhenee n vuoden kuluttua\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5140,40 -4113,32 +5193,40 @@@ msgstr "
" <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
" <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Avain on voimassa? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Allekirjoitus on voimassa? (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "arvo ei kelpaa\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s ei vanhene koskaan\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s ei vanhene koskaan\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s vanhenee %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Allekirjoitus vanhenee %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5181,12 -4146,10 +5234,12 @@@ msgstr "
"Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
"Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Onko tämä oikein (k/e) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5197,7 -4160,6 +5250,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5215,50 -4177,39 +5268,50 @@@ msgstr "
" \"Matti Meikäläinen (nuorempi) <matti.meikalainen at osoite.fi>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Oikea nimi: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Nimessä on epäkelpo merkki\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Nimi ei voi alkaa numerolla\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
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:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Sähköpostiosoite: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Sähköpostiosoite ei kelpaa\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Huomautus: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Huomautuksessa on epäkelpo merkki\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5269,7 -4220,6 +5322,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5284,35 -4234,28 +5337,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnHhSsOoLl"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Ole hyvä ja korjaa ensin virhe\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5324,12 -4267,10 +5377,12 @@@ msgstr "
"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
"paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5337,66 -4278,53 +5390,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" on jo pakattu\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
msgid "creating anyway\n"
msgstr "luo uusi avainpari"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Avaimen luonti keskeytetty.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "HUOM: salainen avain %08lX vanheni %s\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5405,7 -4333,6 +5458,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:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5413,7 -4340,6 +5466,7 @@@ msgstr "
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5421,51 -4347,40 +5474,51 @@@ msgstr "
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
#, 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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Haluatko varmasti luoda? "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "ei koskaan"
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Kriittinen allekirjoituskäytäntö: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Allekirjoituskäytäntö: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Kriittinen allekirjoitusnotaatio: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Allekirjoitusnotaatio: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5473,69 -4388,63 +5526,77 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d väärää allekirjoitusta\n"
msgstr[1] "%d väärää allekirjoitusta\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
+ msgstr[1] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Avainrengas"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ohitetaan \"%s\": %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Ensisijaisen avaimen sormenjälki:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Ensisijaisen avaimen sormenjälki:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " Avaimen sormenjälki ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "tarkistetaan avainrengasta \"%s\"\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
msgstr[1] "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5543,502 -4452,401 +5604,502 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 väärä allekirjoitus\n"
msgstr[1] "1 väärä allekirjoitus\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: avainrengas luotu\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "pyydetään avainta %08lX kohteesta %s\n"
msgstr[1] "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allekirjoitettu avaimellasi %08lX %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s-salattu istuntoavain\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "salattu tuntemattomalla algoritmilla %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "julkinen avain on %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " aka \""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "salattu %s-avaimella, tunnus %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "julkisen avaimen avaus epäonnistui: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "salattu %lu salasanalla\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "salattu yhdellä salasanalla\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "oletettavasti %s-salattua dataa\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
"käyttää sen sijaan salainta %s\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "avaus onnistui\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROITUS: salattua viestiä on muokattu!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
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:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Vanhentunut allekirjoitus lähettäjältä \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "allekirjoituksen varmistus vaiennetaan\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "näitä allekirjoituksia ei voi käsitellä\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " aka \""
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Avain saatavilla kohteessa: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[ei tiedossa]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " aka \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, 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:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binääri"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "teksti"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "tuntematon "
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "tuntematon julkisen avaimen algoritmi"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "allekirjoitus ei ole erillinen\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "ei voi avata tiedostoa: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, 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:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, 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:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "lukuvirhe: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "lukuvirhe: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "pakkaamaton"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "pakkaamaton"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "tuntematon allekirjoitusluokka"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Tiedosto \"%s\" on olemassa."
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Ylikirjoita (k/E)? "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: tuntematon pääte\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Syötä uusi tiedostonimi"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "kirjoitetaan vakiotulosteeseen\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "uusi asetustiedosto \"%s\" luotu\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
@@@ -6046,31 -4854,25 +6107,31 @@@ msgstr "
"VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
"ajossa\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (pääavaimen tunnus %08lX)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6083,15 -4885,12 +6144,15 @@@ msgstr "
"\"%.*s\"\n"
"%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Syötä salasana\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "käyttäjän peruma\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6100,47 -4899,38 +6161,47 @@@ msgstr "
"\n"
"Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Haluatko varmasti poistaa valitut avaimet? "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Haluatko varmasti poistaa valitut avaimet? "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6197,31 -4979,24 +6258,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Ei eriteltyä syytä"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Avain on uusittu"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Avain on murrettu"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Avain ei ole enää käytössä"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "Käyttäjätunnus ei ole enää käytössä"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "mitätöinnin syy: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "mitätöintikommentti: "
@@@ -6235,102 -5010,83 +6296,102 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMlLoO"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Luottamusarvoa ei ole asetettu seuraavalle:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " aka \""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, 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:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = En tiedä\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = EN luota\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Luotan ehdottomasti\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = takaisin päävalikkoon\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " o = ohita tämä avain\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " l = lopeta\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Valintasi? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, 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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Varmennepolku ehdottomasti luotettuun julkiseen avaimeen:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Tämä on oma avain\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6342,135 -5098,107 +6403,135 @@@ msgstr "
"kysymykseen kyllä\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
#, 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:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Huom: Tämä avain on poistettu käytöstä\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Huom: Tämä avain on vanhentunut!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ohitettu: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6478,168 -5206,132 +6539,168 @@@ msgstr "
"\n"
"Syötä käyttäjätunnus. Lopeta tyhjällä rivillä: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Käyttäjätunnusta ei löydy.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Julkinen avain on poistettu käytöstä\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "ohitettu: julkinen avain on jo asetettu\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "ei kelvollisia vastaanottajia\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Erillinen allekirjoitus.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Anna datatiedoston nimi: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "luetaan vakiosyötettä ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "ei allekirjoitettua dataa\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "nimetön vastaanottaja; yritän käyttää salaista avainta %08lX ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "ok, nimetön vastaanottaja olet sinä.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "vanhaa DEK-koodaus ei tueta\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "salausalgoritmi %d%s on tuntematon tai poistettu käytöstä\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "HUOM: salausalgoritmia %d ei löydy valinnoista\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "HUOM: salainen avain %08lX vanheni %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet epäonnistui: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Mitätöinnin tekee:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "Salainen avain on saatavilla.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Luo tälle avaimelle mitätöintivarmenne? "
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "ASCII-koodattu tuloste määritetty.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet epäonnistui: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Mitätöintivarmenne luotu.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Luo tälle avaimelle mitätöintivarmenne? "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6648,20 -5340,17 +6709,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Mitätöintivarmenne luotu.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "salaista avainta \"%s\" ei löydy: %s\n"
@@@ -6669,23 -5358,19 +6730,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Luo tälle avaimelle mitätöintivarmenne? "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6705,93 -5390,75 +6766,93 @@@ msgstr "
"tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
"saataville!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Valitse mitätöinnin syy:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Peru"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Todennäköisesti haluat valita %d tässä)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Mitätöinnin syy: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Kuvausta ei annettu)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Kelpaako tämä? "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "luotu avain on heikko - yritän uudestaan\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"heikon avaimen luomista symmetriselle salaimelle ei voitu välttää; \n"
"yritettiin %d kertaa!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = näytä lisätietoja\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
msgstr[1] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
msgstr[1] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6804,7 -5471,6 +6865,7 @@@ msgstr[1] "
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6816,41 -5482,34 +6877,41 @@@ msgstr[1] "
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "HUOM: avain on mitätöity!"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"VAROITUS: %%-laajennus ei onnistu (liian suuri). Käytetään "
"laajentamatonta.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6858,7 -5517,6 +6919,7 @@@ msgstr "
"VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
"Käytetään laajentamatonta.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6867,55 -5525,45 +6928,55 @@@ msgstr "
"VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
"Käytetään laajentamatonta.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "allekirjoitetaan:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "käytetään %s-salausta\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n"
"satunnaislukugeneraattorin kanssa!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ohitetaan \"%s\": kopio\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6924,340 -5572,274 +6985,340 @@@ msgstr "
"# Luettelo annettuista luottamusarvoista, luotu %s\n"
"# (Käytä \"gpg --import-ownertrust\" palauttaaksesi ne)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "rivi on liian pitkä\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr "tuo luottamusasteet"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "virhe etsittäessä luottamustietuetta: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "lukuvirhe: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: synkronointi epäonnistui: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "trustdb-tapahtuma on liian suuri\n"
- #: 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"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: hakemistoa ei ole olemassa!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, fuzzy, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: versiotietueen luonti epäonnistui: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: luotu trustdb ei kelpaa\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trustdb luotu\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb ei kelpaa\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: virhe päivitettäessä versiotietuetta: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek epäonnistui: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ei ole trustdb-tiedosto\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versiotietue tietuenumerolla %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: tiedostoversio %d ei kelpaa\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: trustdb luotu\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "yli %d merkkiä pitkiä tekstirivejä ei voi käsitellä\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "syöterivi on yli %d merkkiä pitkä\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Tuetut algoritmit:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "julkista avainta %08lX ei löydy: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Käytäntö: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "näytä avaimet"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7267,174 -5849,154 +7328,185 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "avain %08lX: hyväksytty luotettuna avaimena\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7443,7 -6004,6 +7515,7 @@@
msgid "no need for a trustdb check\n"
msgstr "trustdb:n tarkistusta ei tarvita\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "seuraava trustdb tarkistus %s\n"
@@@ -7490,35 -6042,28 +7562,35 @@@ msgstr "ehdottomasti luotettavia avaimi
msgid "public key of ultimately trusted key %s not found\n"
msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
#, fuzzy
msgid "never"
msgstr "ei koskaan"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7530,42 -6075,33 +7602,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "[mitätöity] "
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "[vanhentunut] "
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "tuntematon "
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7575,12 -6111,10 +7647,12 @@@ msgstr "
"Muista, että allekirjoitustiedosto (.sig tai .asc)\n"
"tulee antaa komentorivillä ensimmäisenä.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@@ -7910,7 -6376,6 +7982,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8055,9 -6490,6 +8127,9 @@@ msgstr "virhe luotaessa salasanaa: %s\n
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@@ -8565,7 -6892,6 +8637,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
@@@ -8590,134 -6912,104 +8662,134 @@@ msgstr "avainlohkojen poisto epäonnist
msgid "no valid recipients given\n"
msgstr "(Kuvausta ei annettu)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "näytä salaiset avaimet"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "virheellinen varmenne"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "virheellinen varmenne"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "virheellinen varmenne"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "tuota ascii-koodattu tuloste"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "älä käytä lainkaan päätettä"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "eräajo: älä kysy mitään"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NIMI|käytä salausalgoritmia NIMI"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8728,47 -7020,38 +8800,47 @@@ msgstr "
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Kuvausta ei annettu)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " o = ohita tämä avain\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8786,7 -7066,6 +8858,7 @@@ msgstr "luo mitätöintivarmenne
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -8801,32 -7078,26 +8873,32 @@@ msgstr "virhe luotaessa salasanaa: %s\n
msgid "error reading input: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -9005,7 -7243,6 +9077,7 @@@ msgstr "virheellinen varmenne
msgid " runtime cached certificates: %u\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "Mitätöintivarmenne luotu.\n"
@@@ -9015,8 -7251,6 +9087,8 @@@
msgid "certificate cached\n"
msgstr "valinta %c%lu on kopio\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -9625,13 -7736,11 +9697,13 @@@ msgstr "virheellinen varmenne
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:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9639,85 -7748,69 +9711,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "valinta %c%lu on kopio\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "HUOM: avain on mitätöity!"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Tuetut algoritmit:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9873,12 -7932,10 +9945,12 @@@ msgstr "käyttö: gpg [valitsimet]
msgid "colons are not allowed in the socket name\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@@ -10373,77 -8328,61 +10445,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/fr.po
index e636a7b,33eea36..0d57c01
--- a/po/fr.po
+++ b/po/fr.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 2.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2015-09-10 16:22+0200\n"
"Last-Translator: David Prévot <david at tilapin.org>\n"
"Language-Team: French <traduc at traduc.org>\n"
@@@ -114,8 -98,6 +114,8 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Phrase secrète :"
@@@ -165,24 -136,10 +165,24 @@@ msgstr "Mauvaise phrase secrète
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, c-format
msgid "can't create '%s': %s\n"
msgstr "impossible de créer « %s » : %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
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:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
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"
@@@ -394,8 -312,6 +394,8 @@@ msgstr "Veuillez entrer la phrase secr�
msgid "Please enter the new passphrase"
msgstr "Veuillez entrer la nouvelle phrase secrète"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -403,113 -319,82 +403,113 @@@ msgstr "
"@Options :\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 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:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 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:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "bavard"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "sortie de commandes à la sh"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "sortie de commandes à la csh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "ne pas détacher de la console"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "ne pas capturer le clavier et la souris"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "utiliser un fichier journal pour le serveur"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PROG|utiliser PROG pour entrer le code personnel"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PROG|utiliser PROG comme SCdaemon"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "ne pas utiliser le SCdaemon"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|connect to host NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NOM|se connecter à l'hôte NOM"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "ignorer les demandes de modification du TTY"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "ignorer les demandes de modification d'aff. X"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|oublier les codes personnels après N secondes"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "ne pas utiliser le cache de code pour signer"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr "ne pas marquer les clefs comme de confiance"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "permettre de préconfigurer la phrase secrète"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
msgid "enable ssh support"
msgstr "activer la prise en charge de SSH"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr "activer la prise en charge de putty"
@@@ -517,21 -402,14 +517,21 @@@
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
"et tout problème de traduction à <traduc at traduc.org>.\n"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -539,139 -417,107 +539,145 @@@ msgstr "
"Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
"Gestionnaire de clefs secrètes pour @GNUPG@\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: 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:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "lecture des options de « %s »\n"
- #: agent/gpg-agent.c:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "répertoire « %s » créé\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
+
++#: agent/gpg-agent.c:1964
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "échec de stat() pour « %s » : %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, 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:2314
++#: agent/gpg-agent.c:2322
#, 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:2387
++#: agent/gpg-agent.c:2395
#, 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:2392
++#: agent/gpg-agent.c:2400
#, 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:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s arrêté\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -689,8 -533,6 +695,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:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -698,9 -540,6 +704,9 @@@ msgstr "
"@Commandes :\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -710,11 -549,9 +716,11 @@@ msgstr "
"Options :\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Utilisation : gpg-protect-tool [options] (-h pour l'aide)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -722,16 -559,13 +728,16 @@@ msgstr "
"Syntaxe : gpg-protect-tool [options] [arguments]\n"
"Outils de maintenance des clefs secrètes\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Veuillez entrer la phrase secrète pour déprotéger l'objet PKCS#12."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
"Veuillez entrer la phrase secrète pour protéger le nouvel objet PKCS#12."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -739,7 -573,6 +745,7 @@@ msgstr "
"Veuillez entrer la phrase secrète pour protéger l'objet importé dans le "
"système GnuPG."
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -747,11 -580,9 +753,11 @@@ msgstr "
"Veuillez entrer la phrase secrète ou le code personnel\n"
"nécessaires pour terminer cette opération."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "annulé\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "erreur de demande de la phrase secrète : %s\n"
@@@ -816,8 -637,6 +822,8 @@@ msgstr "
msgid "Yes"
msgstr "Oui"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "Non"
@@@ -849,14 -665,12 +855,14 @@@ msgstr "Exact
msgid "Wrong"
msgstr "Faux"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Remarque : cette phrase secrète n'a jamais été modifiée.%0AVeuillez la "
"modifier maintenant."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@@ -865,15 -679,12 +871,15 @@@ msgstr "
"Cette phrase secrète n'a pas été modifiée%%0Adepuis le %.4s-%.2s-%.2s. "
"Veuillez la modifier maintenant."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "Modifier la phrase secrète"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "Je la modifierai plus tard"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -881,11 -692,9 +887,11 @@@
"%%0A?"
msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
msgid "Delete key"
msgstr "Supprimer la clef"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -895,7 -704,6 +901,7 @@@ msgstr "
"Supprimer cette clef pourrait vous empêcher d’accéder à des machines "
"distantes."
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA nécessite que la taille du hachage soit un multiple de 8 bits\n"
@@@ -935,53 -736,43 +941,58 @@@ msgid "protection hash algorithm %d (%s
msgstr ""
"l'algorithme de protection de hachage %d (%s) n'est pas pris en charge\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "erreur de création d'un tube : %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "erreur de création d'un flux pour un tube : %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "erreur de création de processus fils : %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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "échec d'attente de fin du processus %d : %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "erreur d'exécution de « %s » : il n'est sans doute pas installé\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "erreur d'exécution de « %s » : code de retour %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, c-format
msgid "error running '%s': terminated\n"
msgstr "erreur d'exécution de « %s » : terminé\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "erreur de lecture du code de retour du processus %d : %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "échec d'attente de fin du processus %d : %s\n"
+
+#: common/simple-pwquery.c:376
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "impossible de se connecter à « %s » : %s\n"
@@@ -994,15 -783,17 +1005,21 @@@ msgstr "problème de communication ave
msgid "problem setting the gpg-agent options\n"
msgstr "problème de configuration des options de gpg-agent\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "annulé par l'utilisateur\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "problème avec l'agent\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problème avec l'agent : %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "impossible d'empêcher la génération de fichiers « core » : %s\n"
@@@ -1072,17 -849,18 +1089,22 @@@ msgstr "hors limite de la mémoire séc
msgid "out of core while allocating %lu bytes"
msgstr "hors limite lors de l'allocation de %lu octets"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 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"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s : %u : option « %s » obsolète — non prise en compte\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1376,7 -1087,6 +1398,7 @@@ msgstr "l'option « %.50s » est ambi
msgid "command \"%.50s\" is ambiguous\n"
msgstr "la commande « %.50s » est ambiguë\n"
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "hors limite\n"
@@@ -1385,22 -1094,14 +1407,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "option « %.50s » incorrecte\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "vous avez trouvé un bogue… (%s : %d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "conversion de « %s » vers « %s » non disponible\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "échec de iconv_open : %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "impossible de convertir « %s » en « %s » : %s\n"
@@@ -1439,86 -1133,72 +1456,92 @@@ msgstr "verrou « %s » non effectif�
msgid "waiting for lock %s...\n"
msgstr "attente du verrou %s…\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "armure : %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "en-tête d'armure incorrect : "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "en-tête d'armure : "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "en-tête de signature en texte clair incorrect\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "en-tête d'armure inconnu : "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "signatures en texte clair imbriquées\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "armure inattendue : "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "ligne protégée par « - » incorrecte : "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caractère %02X incorrect en radix64, ignoré\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "fin de fichier prématurée (pas de CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "fin de fichier prématurée (dans le CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "CRC mal défini\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "erreur de CRC ; %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "fin de fichier prématurée (dans le pied)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "erreur dans la ligne de pied\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "aucune donnée OpenPGP valable n'a été trouvée.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armure incorrecte : ligne plus longue que %d caractères\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"caractère Quoted-Printable dans l'armure provenant sans\n"
"doute d'un serveur de courriers électroniques défectueux\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "non lisible par l'utilisateur"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1526,80 -1206,70 +1549,92 @@@ msgstr "
"un nom de notation ne doit contenir que des caractères imprimables ou des "
"espaces, et se terminer avec « = »\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "un nom de notation d'utilisateur doit contenir un caractère « @ »\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "un nom de notation ne doit pas contenir plus d'un caractère « @ »\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "un nom de notation ne doit pas contenir plus d'un caractère « @ »\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "un nom de notation ne doit contenir que des caractères imprimables ou des "
+ "espaces, et se terminer avec « = »\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "Attention : des données de notation incorrectes ont été trouvées.\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "non lisible par l'utilisateur"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "échec de transfert de la demande %s au client\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Entrez la phrase secrète : "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "erreur de création du porte-clefs « %s » : %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: "
msgid "WARNING: %s\n"
msgstr "Attention : "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "impossible de faire cela en mode automatique\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "Cette commande n'est disponible que pour les cartes en version 2\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Quel est votre choix ? "
@@@ -1661,20 -1317,10 +1696,15 @@@ msgstr "URL pour récupérer la clef pu
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Erreur : URL trop longue (limitée à %d caractères).\n"
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "erreur d'écriture de « %s » : %s\n"
@@@ -1773,13 -1400,10 +1803,13 @@@ msgid "What keysize do you want for th
msgstr ""
"Quelle taille de clef désirez-vous pour la clef d'authentification ? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrondie à %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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"
@@@ -1835,9 -1449,6 +1865,9 @@@ msgstr " (2) Clef de chiffrement\n
msgid " (3) Authentication key\n"
msgstr " (3) Clef d'authentification\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Choix incorrect.\n"
@@@ -1872,7 -1477,6 +1902,7 @@@ msgstr "Faut-il continuer ? (O/n)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "quitter ce menu"
@@@ -1880,7 -1483,6 +1910,7 @@@
msgid "show admin commands"
msgstr "afficher les commandes d'administration"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "afficher cette aide"
@@@ -1958,118 -1542,89 +1988,118 @@@ msgstr "Les commandes d'administration
msgid "Admin commands are not allowed\n"
msgstr "Les commandes d'administration ne sont pas permises\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Commande incorrecte (essayez « help »)\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "impossible d'ouvrir « %s »\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clef « %s » introuvable : %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erreur de lecture du bloc de clef : %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(à moins d'indiquer la clef par son empreinte)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
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:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "Faut-il supprimer cette clef du porte-clefs ? (o/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
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:196
++#: g10/delkey.c:195
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "échec de suppression de %s secrète : %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "clef"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "subkey"
msgstr "sous-clef"
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "échec de suppression du bloc de clef : %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "les renseignements de confiance du propriétaire ont été effacées\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erreur de création de la phrase secrète : %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "impossible d'utiliser un paquet ESK symétrique en mode S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "utilisation de l'algorithme de chiffrement %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, c-format
msgid "'%s' already compressed\n"
msgstr "« %s » est déjà compressé\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "Attention : « %s » est un fichier vide\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, c-format
msgid "reading from '%s'\n"
msgstr "lecture de « %s »\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2077,7 -1632,6 +2107,7 @@@ msgstr "
"Attention : forcer le chiffrement symétrique %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2086,41 -1640,34 +2116,41 @@@ msgstr "
"Attention : forcer l'algorithme de compression %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forcer le chiffrement symétrique %s (%d) est en désaccord\n"
"avec les préférences du destinataire\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "impossible d'utiliser %s en mode %s.\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s chiffré pour : « %s »\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "impossible d'utiliser %s en mode %s.\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "données chiffrées avec %s\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "chiffré avec l'algorithme inconnu %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"Attention : le message a été chiffré avec une clef faible pendant le\n"
" chiffrement symétrique.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problème de gestion des paquets chiffrés\n"
@@@ -2183,133 -1719,105 +2213,133 @@@ msgstr "
"Attention : impossible de supprimer le répertoire temporaire « %s » :\n"
" %s\n"
- #: g10/export.c:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "exporter les signatures marquées comme locales seulement"
- #: g10/export.c:81
++#: g10/export.c:80
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:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "exporter les clefs de révocation marquées comme « sensibles »"
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "supprimer les parties inutilisables de la clef pendant l'exportation"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr "supprimer autant que possible de la clef pendant l'exportation"
- #: g10/export.c:896
++#: g10/export.c:895
msgid " - skipped"
msgstr " — ignoré"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "il est interdit d'exporter les clefs secrètes\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "Attention : rien n'a été exporté\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "erreur de création de « %s » : %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[identité introuvable]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, 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:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "erreur de fermeture de %s : %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "erreur de création du porte-clefs « %s » : %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "« %s » automatiquement récupéré par %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, 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:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "Aucune empreinte"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "clef secrète « %s » introuvable : %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "faire une signature"
@@@ -2317,11 -1824,9 +2347,11 @@@
msgid "make a clear text signature"
msgstr "faire une signature en texte clair"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "faire une signature détachée"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "chiffrer les données"
@@@ -2329,15 -1833,12 +2359,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "chiffrement symétrique seulement"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "déchiffrer les données (défaut)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "vérifier une signature"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "afficher les clefs"
@@@ -2349,15 -1848,12 +2379,15 @@@ msgstr "afficher les clefs et les signa
msgid "list and check key signatures"
msgstr "afficher et vérifier les signatures de clefs"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "afficher les clefs et les empreintes"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "afficher les clefs secrètes"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "générer une nouvelle paire de clefs"
@@@ -2379,7 -1871,6 +2409,7 @@@ msgstr "générer une paire de clefs co
msgid "generate a revocation certificate"
msgstr "générer un certificat de révocation"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "supprimer les clefs du porte-clefs public"
@@@ -2407,7 -1892,6 +2437,7 @@@ msgstr "signer une clef localement
msgid "sign or edit a key"
msgstr "signer ou éditer une clef"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "modifier une phrase secrète"
@@@ -2455,24 -1928,19 +2485,24 @@@ msgstr "mettre la base de confiance à
msgid "print message digests"
msgstr "indiquer les fonctions de hachage"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "exécuter en mode serveur"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "créer une sortie ASCII avec armure"
# NOTE: Extra initial space to realign the output (maybe wchar issue)
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
@@@ -2484,11 -1950,9 +2514,11 @@@ msgstr "|N|niveau de compression N (0 d
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FICHIER|écrire la sortie dans le FICHIER"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "ne rien modifier"
@@@ -2500,7 -1962,6 +2530,7 @@@ msgstr "demander avant d'écraser un fi
msgid "use strict OpenPGP behavior"
msgstr "utiliser le comportement strict d'OpenPGP"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2509,7 -1970,6 +2539,7 @@@ msgstr "
"(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
"et options)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2529,11 -1989,9 +2559,11 @@@ msgstr "
" --list-keys [noms] montrer les clefs\n"
" --fingerprint [noms] montrer les empreintes\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
- #: g10/gpg.c:988
++#: g10/gpg.c:991
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2543,7 -2001,6 +2573,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:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2551,86 -2008,71 +2581,86 @@@ msgstr "
"\n"
"Algorithmes pris en charge :\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Clef publique : "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Chiffrement : "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hachage : "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Compression : "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "utilisation : %s [options] %s\n"
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2638,21 -2080,18 +2668,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:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2660,502 -2099,391 +2690,502 @@@ msgstr "
"Attention : les droits du répertoire contenant le fichier de configuration\n"
" « %s » ne sont pas sûrs\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "élément de configuration « %s » inconnu\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "montrer les photos d'identité en affichant les clefs"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
msgid "show key usage information during key listings"
msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "montrer les URL de politique en affichant les signatures"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "montrer toutes les notations en affichant les signatures"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "utiliser les notations aux normes IETF en affichant les signatures"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
"utiliser les notations fournies par l'utilisateur en affichant les signatures"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"montrer les URL des serveurs de clefs favoris en affichant les signatures"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "indiquer la validité de l'identité en affichant les clefs"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
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:1883
++#: g10/gpg.c:1886
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:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "montrer le nom du porte-clefs en affichant les clefs"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "montrer les dates d'expiration en affichant les signatures"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Clefs disponibles :\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
#| msgid "unknown option '%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "option « %s » inconnue\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
#| msgid "unknown command '%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "commande « %s » inconnue\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, 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:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "mode pinentry « %s » incorrect\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "impossible d'analyser l'URL du serveur de clefs\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s : %d : options d'importation incorrectes\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "options d'importation incorrectes\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s : %d : options d'exportation incorrectes\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "options d'exportation incorrectes\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s : %d : options de liste incorrectes\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "options de liste incorrectes\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "montrer les photos d'identité en vérifiant les signatures"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "montrer les URL de politique en vérifiant les signatures"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "montrer toutes les notations en vérifiant les signatures"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
"utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
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:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "indiquer la validité de l'identité en vérifiant les signatures"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
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:3053
++#: g10/gpg.c:3060
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:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "valider les signatures avec les données PKA"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
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:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s : %d : options de vérification incorrectes\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "options de vérification incorrectes\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, 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:3265
++#: g10/gpg.c:3272
#, 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:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "liste de recherche automatique de clef incorrecte\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Attention : %s remplace %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s.\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s.\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 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:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage sélectionnée est incorrecte\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorithme de compression sélectionné est incorrect\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "« completes-needed » doit être supérieur à 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "« marginals-needed » doit être supérieur à 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "préférences par défaut incorrectes\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "préférences personnelles de chiffrement incorrectes\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "préférences personnelles de hachage incorrectes\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "préférences personnelles de compression incorrectes\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne fonctionne pas encore avec %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance : %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [fichier]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [fichier]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "échec du chiffrement symétrique de « %s » : %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [fichier]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [fichier]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
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:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [fichier]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [fichier]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [fichier]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
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:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [fichier]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [fichier]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [fichier]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key identité"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key identité"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key identité [commandes]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd <identité>"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "échec d'envoi vers le serveur de clefs : %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "échec de réception depuis le serveur de clefs : %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "échec d'exportation de la clef : %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "échec d'exportation de la clef : %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "échec de recherche au sein du serveur de clefs : %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "échec de déconstruction d'une armure : %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "échec de construction d'une armure : %s \n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "algorithme de hachage « %s » incorrect\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, 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:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[fichier]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message…\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL de politique de certification donnée est incorrecte\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL de politique de signature donnée est incorrecte\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
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"
@@@ -3167,7 -2493,6 +3197,7 @@@ msgstr "|FICHIER|prendre les clefs dan
msgid "make timestamp conflicts only a warning"
msgstr "convertir les conflits de date en avertissements"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|écrire l'état sur ce descripteur"
@@@ -3192,128 -2513,102 +3222,128 @@@ msgstr "Pas d'aide disponible
msgid "No help available for '%s'"
msgstr "Pas d'aide disponible pour « %s »"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "importer des signatures marquées comme locales seulement"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "réparer les données endommagées du serveur pks pendant l'importation"
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "ne pas mettre à jour la base de confiance après l'importation"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "ne pas mettre à jour la base de confiance après l'importation"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "n'accepter que les mises à jour des clefs existantes"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "nettoyer les parties inutilisables de la clef après l'importation"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "supprimer autant que possible de la clef après l'importation"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "un bloc de type %d a été ignoré\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu clefs traitées jusqu'à présent\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Quantité totale traitée : %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " nouvelles clefs ignorées : %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nouvelles clefs ignorées : %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sans identité : %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importées : %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " non modifiées : %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nouvelles identités : %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nouvelles sous-clefs : %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " nouvelles signatures : %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nouvelles révocations de clef : %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " clefs secrètes lues : %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " clefs secrètes importées : %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " clefs secrètes non modifiées : %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " non importées : %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signatures nettoyées : %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " identités nettoyées : %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3322,195 -2617,155 +3352,195 @@@ msgstr "
"Attention : la clef %s contient des préférences pour des\n"
" algorithmes indisponibles pour ces identités :\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " « %s » : préférence pour l'algorithme de chiffrement %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " « %s » : préférence pour l'algorithme de hachage %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " « %s » : préférence pour l'algorithme de compression %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "vous devriez mettre à jour vos préférences et redistribuer cette\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "clef pour éviter d'éventuels problèmes d'algorithmes non appropriés\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"vous pouvez mettre à jour vos préférences avec :\n"
"gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "clef %s : pas d'identité\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, c-format
msgid "key %s: %s\n"
msgstr "clef %s : %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr "rejetée par le filtre d’importation"
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clef %s : corruption de sous-clef PKS réparée\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clef %s : identité « %s » non autosignée acceptée\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clef %s : pas d'identité valable\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "cela pourrait provenir d'une autosignature manquante\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clef %s : clef publique introuvable : %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "clef %s : nouvelle clef — ignorée\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, 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:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "écriture de « %s »\n"
- #: g10/import.c:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "erreur d'écriture du porte-clefs « %s » : %s\n"
- #: g10/import.c:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clef %s : clef publique « %s » importée\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clef %s : ne correspond pas à notre copie\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clef %s : « %s » 1 nouvelle identité\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clef %s : « %s » %d nouvelles identités\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clef %s : « %s » 1 nouvelle signature\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clef %s : « %s » %d nouvelles signatures\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clef %s : « %s » 1 nouvelle sous-clef\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clef %s : « %s » %d nouvelles sous-clefs\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clef %s : « %s » %d signature nettoyée\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clef %s : « %s » %d signatures nettoyées\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clef %s : « %s » %d identité nettoyée\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clef %s : « %s » %d identités nettoyées\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clef %s : « %s » n'est pas modifiée\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clef %s : clef secrète importée\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, c-format
msgid "secret key %s: %s\n"
msgstr "clef secrète %s : %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "impossible d'importer des clefs secrètes\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3525,200 -2780,183 +3555,225 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clef %s : « %s » certificat de révocation importé\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clef %s : pas d'identité pour la signature\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clef %s : algorithme à clef publique non pris en charge\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clef %s : signature directe de clef incorrecte\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clef %s : lien à la sous-clef incorrect\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clef %s : suppression de lien multiple aux sous-clefs\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clef %s : révocation de sous-clef incorrecte\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, 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:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clef %s : identité « %s » ignorée\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clef %s : sous-clef ignorée\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clef %s : ajout du certificat de révocation « %s »\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clef %s : ajout de la signature directe de clef\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "erreur de création du trousseau local « %s » : %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, c-format
msgid "error creating keyring '%s': %s\n"
msgstr "erreur de création du porte-clefs « %s » : %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, c-format
msgid "keybox '%s' created\n"
msgstr "le trousseau local « %s » a été créé\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, c-format
msgid "keyring '%s' created\n"
msgstr "le porte-clefs « %s » a été créé\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "ressource de bloc de clef « %s » : %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, 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:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "échec de reconstruction du cache de porte-clefs : %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[révocation]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[autosignature]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d mauvaises signatures\n"
- msgstr[1] "%d mauvaises signatures\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "clef %s : algorithme à clef publique non pris en charge\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "Good signature from"
+ msgid " (reordered signatures follow)"
+ msgstr "Bonne signature de"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "key %s: %s\n"
+ msgid "key %s:\n"
+ msgstr "clef %s : %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Identité « %s » : %d signature supprimée\n"
+ msgstr[1] "Identité « %s » : %d signature supprimée\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3726,23 -2964,26 +3781,30 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signature non vérifiée à cause d'une clef manquante\n"
msgstr[1] "1 signature non vérifiée à cause d'une clef manquante\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 signature non vérifiée à cause d'une erreur\n"
- msgstr[1] "1 signature non vérifiée à cause d'une erreur\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d mauvaises signatures\n"
+ msgstr[1] "%d mauvaises signatures\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d identités sans autosignature valable détecté\n"
- msgstr[1] "%d identités sans autosignature valable détecté\n"
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Bonne signature de"
+ msgstr[1] "Bonne signature de"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3753,17 -2994,14 +3815,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:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = je fais très légèrement confiance\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = je fais entièrement confiance\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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,52 -3011,40 +3835,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:501
++#: g10/keyedit.c:1014
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:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'identité « %s » est révoquée."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Voulez-vous vraiment toujours la signer ? (o/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Impossible de signer.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'identité « %s » est expiré."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'identité « %s » n'est pas autosignée."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'identité « %s » peut être signée. "
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "Faut-il la signer ? (o/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3827,11 -3053,9 +3889,11 @@@ msgstr "
"L'autosignature de « %s »\n"
"est une signature de type PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3840,13 -3064,11 +3902,13 @@@ msgstr "
"Votre signature actuelle de « %s »\n"
"a expiré.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3855,43 -3077,34 +3917,43 @@@ msgstr "
"Votre signature actuelle de « %s »\n"
"est locale.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, 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:833
++#: g10/keyedit.c:1346
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:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Rien à signer avec la clef %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Cette clef a expiré."
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Cette clef va expirer le %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3900,31 -3113,25 +3962,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:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Je ne répondrai pas.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, 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:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) J'ai partiellement vérifié.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
msgid "Your selection? (enter '?' for more information): "
msgstr "Quel est votre choix ? (Entrez « ? » pour plus de renseignements) : "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3933,233 -3140,175 +3995,229 @@@ msgstr "
"Voulez-vous vraiment signer cette clef avec votre\n"
"clef « %s » (%s)\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Ce sera une autosignature.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "La signature sera marquée comme non exportable.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "La signature sera marquée comme non révocable.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
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:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "J'ai partiellement vérifié cette clef.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "J'ai complètement vérifié cette clef.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Voulez-vous vraiment signer ? (o/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "échec de la signature : %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
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:1223
++#: g10/keyedit.c:1736
#, 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:1270
- 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:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "enregistrer et quitter"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "afficher l'empreinte de la clef"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Entrez le keygrip : "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "afficher la clef et les identités"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "sélectionner l'identité N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "sélectionner la sous-clef N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "vérifier les signatures"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
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:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "signer les identités sélectionnées localement"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
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:1407
++#: g10/keyedit.c:1873
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:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "ajouter une identité"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "ajouter une photo d'identité"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "supprimer les identités sélectionnées"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "ajouter une sous-clef"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "ajouter une clef à une carte à puce"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "déplacer une clef vers une carte à puce"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "déplacer une clef de sauvegarde vers une carte à puce"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "supprimer les sous-clefs sélectionnées"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "ajouter une clef de révocation"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "supprimer les signatures des identités sélectionnées"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
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:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "marquer l'identité sélectionnée comme principale"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "afficher les préférences (expert)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "afficher les préférences (bavard)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
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:1441
++#: g10/keyedit.c:1907
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:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "définir une notation pour les identités sélectionnées"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "modifier la phrase secrète"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "modifier la confiance du propriétaire"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "révoquer les signatures des identités sélectionnées"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "révoquer les identités sélectionnées"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "révoquer la clef ou des sous-clefs sélectionnées"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "activer la clef"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "désactiver la clef"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "montrer les photos d'identité sélectionnées"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
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:1465
++#: g10/keyedit.c:1931
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:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "La clef secrète est disponible.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "La clef secrète est nécessaire pour faire cela.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4171,251 -3320,199 +4229,257 @@@ msgstr "
" confiance (tsign), « nr » pour les signatures non révocables\n"
" (nrsign), ou toute combinaison possible (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "La clef est révoquée."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, 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:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Conseil : sélectionner les identités à signer\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Type de signature « %s » inconnu\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Vous devez sélectionner au moins une identité.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
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:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "Faut-il vraiment déplacer la clef principale ? (o/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Vous devez sélectionner exactement une clef.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "La commande attend un nom de fichier comme argument\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Impossible d'ouvrir « %s » : %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Vous devez sélectionner au moins une clef.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
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:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "Voulez-vous vraiment supprimer cette clef ? (o/N) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
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:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "Voulez-vous vraiment révoquer cette identité ? (o/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
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:2099
++#: g10/keyedit.c:2565
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:2101
++#: g10/keyedit.c:2567
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:2150
++#: g10/keyedit.c:2625
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:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Définir la liste de préférences en :\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Faut-il enregistrer les modifications ? (o/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Faut-il quitter sans enregistrer ? (o/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "échec de la mise à jour : %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
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:2494
++#: g10/keyedit.c:2968
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "« %s » n’est pas une empreinte\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "« %s » n’est pas l’empreinte principale\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "valeur incorrecte\n"
+
++#: g10/keyedit.c:3099
msgid "No matching user IDs."
msgstr "Pas d’identités correspondantes."
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
msgid "Nothing to sign.\n"
msgstr "Rien à signer.\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Hachage : "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Fonctionnalités : "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "Serveur de clefs sans modification"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Serveur de clefs favori : "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "Notations : "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(sensible)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "créé : %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "révoquée : %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "expirée : %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "expire : %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "utilisation : %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "nº de carte : "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "confiance : %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "validité : %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Cette clef a été désactivée"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4423,17 -3520,12 +4487,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "révoquée"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "expirée"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4442,15 -3534,12 +4506,15 @@@ msgstr "
"commande\n"
" risque de rendre une autre identité principale par défaut.\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
msgid "You may want to change its expiration date too.\n"
msgstr "Vous pourriez modifier aussi sa date d’expiration.\n"
- #: g10/keyedit.c:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4459,36 -3548,28 +4523,36 @@@ msgstr "
"Attention : c'est une clef de type PGP 2. Ajouter une photo d'identité\n"
" peut forcer certaines versions de PGP à rejeter cette clef.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr "Cette identité existe déjà pour cette clef.\n"
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Supprimer cette bonne signature ? (o/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Supprimer cette signature inconnue ? (o/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4496,20 -3577,16 +4560,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d signature supprimée.\n"
msgstr[1] "%d signature supprimée.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Rien n'a été supprimé.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "incorrecte"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Identité « %s » compactée : %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4517,17 -3594,14 +4581,17 @@@ msgid_plural "User ID \"%s\": %d signat
msgstr[0] "Identité « %s » : %d signature supprimée\n"
msgstr[1] "Identité « %s » : %d signature supprimée\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Identité « %s » : déjà minimisée\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Identité « %s » : déjà nettoyée\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4536,43 -3610,35 +4600,43 @@@ msgstr "
"Attention : c'est une clef de type PGP 2.x. Ajouter un révocateur désigné\n"
" peut forcer certaines versions de PGP à rejeter cette clef.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Entrez l'identité du révocateur désigné : "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
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:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4582,234 -3648,184 +4646,234 @@@ msgid "
msgstr ""
"Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "Modification de la date d'expiration d'une sous-clef.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Modification de la date d'expiration de la clef principale.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, 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:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Veuillez sélectionner exactement une identité.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "Entrez l'URL de votre serveur de clefs favori : "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "Entrez la notation : "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "Faut-il continuer ? (o/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Pas d'identité d'indice %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Pas d'identité avec le hachage %s\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "Pas de sous-clef d'indice %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "identité : « %s »\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Cette signature a expiré le %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
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:5178
++#: g10/keyedit.c:5802
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:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "Non signée par vous.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (non révocable)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, 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:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "pas de clef secrète\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'identité « %s »\" est déjà révoquée.\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "La clef %s est déjà révoqué.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "La sous-clef %s est déjà révoquée.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Affichage de la photo d'identité %s de taille %ld pour la clef\n"
"%s (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "préférence « %s » en double\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "trop de préférences de chiffrement\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "trop de préférences de hachage\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "trop de préférences de compression\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "élément « %s » incorrect dans la chaîne de préférences\n"
# g10/keygen.c:123 ???
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "écriture de la signature directe\n"
# g10/keygen.c:123 ???
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "écriture de l'autosignature\n"
# g10/keygen.c:161 ???
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "écriture de la signature de lien à la clef\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "taille incorrecte ; utilisation de %u bits\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "taille arrondie à %u bits\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"Attention : certains programmes OpenPGP ne peuvent pas gérer\n"
" de clef DSA avec cette taille de hachage\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Signer"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Certifier"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Chiffrer"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Authentifier"
@@@ -4823,150 -3839,119 +4887,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "SsCcAaQq"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Actions possibles pour une clef %s : "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "Actions actuellement permises : "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Inverser la capacité de signature\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Inverser la capacité de chiffrement\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Inverser la capacité d'authentification\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Terminé\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Sélectionnez le type de clef désiré :\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA et RSA (par défaut)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA et Elgamal\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (signature seule)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (signature seule)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (chiffrement seul)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (chiffrement seul)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (indiquez vous-même les capacités)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (indiquez vous-même les capacités)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC et ECC\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (signature seule)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (indiquez vous-même les capacités)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (chiffrement seul)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Clef existante\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "Entrez le keygrip : "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Ce n'est pas un keygrip valable (40 chiffres hexadécimaux attendus)\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "Pas de clef avec ce keygrip\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "les clefs %s peuvent faire une taille comprise entre %u et %u bits.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Quelle taille de clef désirez-vous pour la sous-clef ? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Quelle taille de clef désirez-vous ? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La taille demandée est %u bits\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, c-format
msgid "rounded to %u bits\n"
msgstr "arrondie à %u bits\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
msgid "Please select which elliptic curve you want:\n"
msgstr "Sélectionnez le type de courbe elliptique désiré :\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4982,7 -3967,6 +5046,7 @@@ msgstr "
" <n>m = la clef expire dans n mois\n"
" <n>y = la clef expire dans n ans\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4999,38 -3983,30 +5063,38 @@@ msgstr "
" <n>m = la signature expire dans n mois\n"
" <n>y = la signature expire dans n ans\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Pendant combien de temps la clef est-elle valable ? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Pendant combien de temps la signature est-elle valable ? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "valeur incorrecte\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "La clef n'expire pas du tout\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "La signature n'expire pas du tout\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "La clef expire le %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "La signature expire le %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5038,11 -4014,9 +5102,11 @@@ msgstr "
"Le système ne peut pas afficher les dates au-delà de 2038.\n"
"Cependant, la gestion des dates sera correcte jusqu'en 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Est-ce correct ? (o/N) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5056,7 -4030,6 +5120,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5072,49 -4045,38 +5136,49 @@@ msgstr "
" « Heinrich Heine (le poète) <heinrichh at duesseldorf.de> »\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Nom réel : "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Caractère incorrect dans le nom\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Le nom ne doit pas commencer par un chiffre\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Le nom doit contenir au moins cinq caractères\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Adresse électronique : "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Ce n'est pas une adresse électronique valable\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Commentaire : "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Caractère incorrect dans le commentaire\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Vous utilisez le jeu de caractères « %s ».\n"
- #: g10/keygen.c:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5125,7 -4087,6 +5189,7 @@@ msgstr "
" « %s »\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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 "
@@@ -5142,34 -4103,27 +5206,34 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcAaOoQq"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Changer le (N)om, l’(A)dresse électronique ou (Q)uitter ? "
- #: g10/keygen.c:2658
++#: g10/keygen.c:2671
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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Veuillez d'abord corriger l'erreur\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5181,12 -4135,10 +5245,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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Échec de génération de la clef : %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5197,64 -4149,51 +5261,64 @@@ msgstr "
" « %s »\n"
"\n"
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr "Faut-il continuer ? (O/n) "
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Une clef pour « %s » existe déjà\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
msgid "Create anyway? (y/N) "
msgstr "Faut-il quand même créer ? (o/N) "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
msgid "creating anyway\n"
msgstr "création quand même\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, 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:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "La génération de clef a été annulée.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Remarque : sauvegarde de la clef de la carte dans « %s »\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, c-format
msgid "writing public key to '%s'\n"
msgstr "écriture de la clef publique dans « %s »\n"
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
#, 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:4167
++#: g10/keygen.c:4193
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
- #: g10/keygen.c:4196
++#: g10/keygen.c:4222
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:4207
++#: g10/keygen.c:4233
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"
@@@ -5263,7 -4202,6 +5327,7 @@@ msgstr "
"pouvez\n"
"utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5271,7 -4209,6 +5335,7 @@@ msgstr "
"la clef a été créée %lu seconde dans le futur (faille temporelle ou\n"
"problème d'horloge)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5279,50 -4216,39 +5343,50 @@@ msgstr "
"la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
"problème d'horloge)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
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:4294
++#: g10/keygen.c:4320
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:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Faut-il vraiment la créer ? (o/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "jamais "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Politique de signature critique : "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Politique de signature : "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Serveur de clefs critique favori : "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Notation de signature critique : "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Notation de signature : "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5330,7 -4256,13 +5394,15 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d mauvaises signatures\n"
msgstr[1] "%d mauvaises signatures\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 signature non vérifiée à cause d'une erreur\n"
+ msgstr[1] "1 signature non vérifiée à cause d'une erreur\n"
+
++#: g10/keylist.c:562
#, fuzzy, c-format
#| msgid "Warning: %lu key(s) skipped due to their large size\n"
msgid "Warning: %lu key skipped due to its large size\n"
@@@ -5338,47 -4270,37 +5410,47 @@@ msgid_plural "Warning: %lu keys skippe
msgstr[0] "Attention : %lu clefs ignorées en raison de leur grande taille\n"
msgstr[1] "Attention : %lu clefs ignorées en raison de leur grande taille\n"
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Porte-clefs"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "« %s » a été ignorée : %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Empreinte de clef principale :"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr "Empreinte clef princip. :"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Empreinte de sous-clef :"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " Empreinte de la clef ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " Nº de série de carte ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, c-format
msgid "caching keyring '%s'\n"
msgstr "mise en cache du porte-clefs « %s »\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5386,7 -4308,6 +5458,7 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu clefs mises en cache pour l'instant (%lu signatures)\n"
msgstr[1] "%lu clefs mises en cache pour l'instant (%lu signatures)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
@@@ -5394,7 -4315,6 +5466,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "vider le cache"
msgstr[1] "vider le cache"
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5402,60 -4322,47 +5474,60 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 mauvaise signature\n"
msgstr[1] "1 mauvaise signature\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s : porte-clefs créé\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "inclure les clefs révoquées dans les résultats de recherche"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "inclure les sous-clefs en cherchant par identifiant de clef"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "récupérer les clefs automatiquement en vérifiant les signatures"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
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:104
++#: g10/keyserver.c:103
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:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "désactivée"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Entrez le ou les nombres, (S)uivant, ou (Q)uitter > "
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, 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:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "« %s » n'est pas un identifiant de clef : ignoré\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5463,361 -4370,288 +5535,361 @@@ msgid_plural "refreshing %d keys from %
msgstr[0] "rafraîchissement de %d clefs à partir de %s\n"
msgstr[1] "rafraîchissement de %d clefs à partir de %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "clef « %s » introuvable sur le serveur de clefs\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "clef introuvable sur le serveur de clefs\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "pas de serveur de clefs connu (utilisez l'option --keyserver)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "requête de la clef %s sur %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "pas d'action pour le serveur de clefs.\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "envoi de la clef %s à %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, c-format
msgid "requesting key from '%s'\n"
msgstr "requête de la clef sur « %s »\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Attention : impossible de récupérer l'URI %s : %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "taille étonnante pour une clef de session chiffrée (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "clef de session chiffrée %s\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "phrase secrète générée avec l'algorithme de hachage %d inconnu\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "la clef publique est %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr ""
"données chiffrées par clef publique : bonne clef de chiffrement (DEK)\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr ""
"chiffré avec une clef %2$s de %1$u bits, identifiant %3$s, créée le %4$s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " « %s »\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "chiffré avec une clef %s, identifiant %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "échec du déchiffrement par clef publique : %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "chiffré avec %lu phrases secrètes\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "chiffré avec 1 phrase secrète\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "les données sont supposées chiffrées avec %s\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"L'algorithme IDEA n'est pas disponible, essai avec %s\n"
"qui fonctionnera peut-être avec un peu de chance\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "Attention : l'intégrité du message n'était pas protégée\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "le déchiffrement a réussi\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "Attention : le message chiffré a été manipulé.\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "échec du déchiffrement : %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "Remarque : l'expéditeur a demandé « à votre seule attention »\n"
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nom de fichier original : « %.*s »\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "Attention : plusieurs textes en clair ont été vus\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "révocation autonome — utilisez « gpg --import » pour l'appliquer\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "aucune signature trouvée\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "MAUVAISE signature de « %s »"
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature expirée de « %s »"
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "Bonne signature de « %s »"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "vérification de signature supprimée\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "impossible de traiter ces données ambiguës de signature\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Signature faite le %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " avec la clef %s %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Clef disponible sur : "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[doute]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " alias « %s »"
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "La signature a expiré le %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "La signature expire le %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "signature %s, algorithme de hachage %s%s%s\n"
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binaire"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "mode texte"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "inconnu"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
msgid ", key algorithm "
msgstr ", algorithme de clef "
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossible de vérifier la signature : %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "la signature n'est pas détachée\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signature autonome de classe 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "signature d'un ancien type (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "échec du fstat de « %s » dans %s : %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "échec de fstat(%d) dans %s : %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
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:302
++#: g10/misc.c:300
#, 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:321
++#: g10/misc.c:319
#, 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:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "Attention : l'algorithme de hachage %s est déconseillé\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "%s:%u: read error: %s\n"
msgid "(reported error: %s)\n"
msgstr "%s : %u : erreur de lecture : %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in '%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "erreur de lecture dans « %s » : %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s : %d : option « %s » déconseillée\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "Attention : « %s » est une option déconseillée\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "veuillez plutôt utiliser « %s%s »\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
"%s : %u : « %s » est obsolète dans ce fichier — n’est prise en compte que "
"dans %s\n"
- #: g10/misc.c:1085
++#: g10/misc.c:1083
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5825,107 -4659,86 +5897,107 @@@ msgstr "
"Attention : « %s%s » est une option obsolète — non prise en compte à part "
"dans %s\n"
- #: g10/misc.c:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Non compressé"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "non compressé|non|sans"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "option « %s » ambiguë\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, c-format
msgid "unknown option '%s'\n"
msgstr "option « %s » inconnue\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
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:1754
++#: g10/misc.c:1752
#, 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
++#: g10/openfile.c:84
#, c-format
msgid "File '%s' exists. "
msgstr "Le fichier « %s » existe. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Faut-il réécrire par-dessus ? (o/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s : suffixe inconnu\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Entrez le nouveau nom de fichier"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "écriture vers la sortie standard\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "les données signées sont supposées être dans « %s »\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, c-format
msgid "new configuration file '%s' created\n"
msgstr "nouveau fichier de configuration « %s » créé\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr ""
"Attention : les options de « %s » ne sont pas encore actives cette fois\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossible de gérer l'algorithme à clef publique %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"Attention : la clef de session chiffrée de manière symétrique risque\n"
" de ne pas être sécurisée\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "un sous-paquet de type %d possède un bit critique\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problème avec l'agent : %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (identifiant de clef principale %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -5941,15 -4754,12 +6013,15 @@@ msgstr "
"clef %4$s de %3$u bits, identifiant %5$s,\n"
"créée le %6$s%7$s.\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Entrez la phrase secrète\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "annulé par l'utilisateur\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -5958,51 -4768,42 +6030,51 @@@ msgstr "
"Une phrase secrète est nécessaire pour déverrouiller la clef secrète de\n"
"l'utilisateur : « %s »\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "clef %2$s de %1$u bits, identifiant %3$s, créée le %4$s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (sous-clef de la clef principale d'identifiant %s)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"Veuillez entrer la phrase secrète pour déverrouiller la clef secrète "
"OpenPGP :"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"Veuillez entrer la phrase secrète pour importer la clef secrète OpenPGP :"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
"Veuillez entrer la phrase secrète pour exporter la sous-clef secrète "
"OpenPGP :"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr ""
"Veuillez entrer la phrase secrète pour exporter la clef secrète OpenPGP :"
# NOTE: s/subkey key/subkey/
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr ""
"Voulez-vous vraiment supprimer de façon permanente la sous-clef secrète "
"OpenPGP :"
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr ""
"Voulez-vous vraiment supprimer de façon permanente la clef secrète OpenPGP :"
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, c-format
msgid ""
"%s\n"
@@@ -6062,31 -4855,24 +6134,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Aucune cause indiquée"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "La clef a été remplacée"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "La clef a été compromise"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "La clef n'est plus utilisée"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "L'identité n'est plus valable"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "cause de révocation : "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "commentaire de révocation : "
@@@ -6100,54 -4886,43 +6172,54 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "rRmMqQiI"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Pas de valeur de confiance définie pour :\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " alias « %s »\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, 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:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = je ne fais PAS confiance\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = j'attribue une confiance ultime\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = retour au menu principal\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " i = ignorer cette clef\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " q = quitter\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6156,42 -4931,34 +6228,42 @@@ msgstr "
"Le niveau de confiance minimal pour cette clef est : %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Quelle est votre décision ? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificats conduisant vers une clef de confiance ultime :\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "Cette clef appartient sans doute à l'utilisateur nommé\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Cette clef nous appartient\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6202,136 -4969,108 +6274,136 @@@ msgstr "
"faites, vous pouvez répondre oui à la prochaine question.\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "Faut-il quand même utiliser cette clef ? (o/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "Attention : utilisation d'une clef sans confiance.\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr ""
" Cela pourrait signifier que la signature est contrefaite.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Remarque : cette clef a été désactivée.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, 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:589
++#: g10/pkclist.c:604
#, 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:601
++#: g10/pkclist.c:616
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:609
++#: g10/pkclist.c:624
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:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Remarque : cette clef a expiré.\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "Attention : nous n'avons PAS confiance en cette clef.\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " La signature est sans doute CONTREFAITE.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s : ignoré : %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s : ignoré : la clef publique est désactivée\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s : ignoré : clef publique déjà présente\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to '%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "impossible de se connecter à « %s » : %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
#| msgid "line %d: invalid date given\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "ligne %d : date donnée incorrect\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
#| msgid "line %d: invalid date given\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "ligne %d : date donnée incorrect\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Destinataires actuels :\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6339,169 -5078,133 +6411,169 @@@ msgstr "
"\n"
"Entrez l'identité, en terminant par une ligne vide : "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Cette identité n'existe pas.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "La clef publique est désactivée.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "ignoré : clef publique déjà activée\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinataire par défaut « %s » inconnu\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "pas de destinataire valable\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, 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:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Signature détachée.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Entrez le nom du fichier de données : "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "lecture de l'entrée standard…\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "pas de données signées\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "impossible d'ouvrir les données signées « %s »\n"
- #: g10/plaintext.c:735
++#: g10/plaintext.c:734
#, 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"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinataire anonyme ; essai avec clef secrète %s…\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "d'accord, nous sommes le destinataire anonyme.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr ""
"l'ancien encodage de la clef de chiffrement (DEK) n'est pas pris en charge\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "l'algorithme de chiffrement %d%s est inconnu ou désactivé\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"Attention : l'algorithme de chiffrement %s est introuvable\n"
" dans les préférences du destinataire\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "Remarque : la clef secrète %s a expiré le %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "échec de build_packet : %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "la clef %s n'a pas d'identité\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "À révoquer par :\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(c'est une clef de révocation sensible)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, 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
++#: g10/revoke.c:327
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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "sortie forcée avec armure ASCII.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "échec de make_keysig_packet : %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Certificat de révocation créé.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "aucune clef de révocation trouvée pour « %s »\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Ceci est un certificat de révocation pour la clef OpenPGP :"
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
#, fuzzy
#| msgid ""
#| "Use it to revoke this key in case of a compromise or loss of\n"
@@@ -6520,7 -5223,6 +6592,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:576
++#: g10/revoke.c:575
#, fuzzy
#| msgid ""
#| "To avoid an accidental use of this file, a colon has been inserted\n"
@@@ -6536,13 -5238,11 +6608,13 @@@ msgstr "
"Supprimez ce deux-points avec un éditeur de texte avant\n"
"d’utiliser ce certificat de révocation."
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Certificat de révocation créé.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6551,22 -5251,18 +6623,22 @@@ msgstr "clef secrète « %s » introu
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "erreur de création du porte-clefs « %s » : %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
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:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6587,81 -5283,65 +6659,81 @@@ msgstr "
"d'impression\n"
"utilisé pourrait stocker ces données et les rendre accessibles à d'autres.\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "choisissez la cause de la révocation :\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Annuler"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Vous devriez sûrement sélectionner %d ici)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Cause de révocation : %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Aucune description donnée)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Est-ce d'accord ? (o/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "clef faible générée — nouvel essai\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"impossible d'éviter une clef faible pour le chiffrement symétrique :\n"
"%d essais ont eu lieu.\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "la clef %s %s utilise un hachage non sûr (%zu bits)\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
"la clef %s %s nécessite un hachage d'au moins %zu bits (le hachage est %s)\n"
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "Attention : conflit de hachage de signature dans le message\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "veuillez consulter %s pour plus de renseignements\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6671,7 -5351,6 +6743,7 @@@ msgstr[0] "
msgstr[1] ""
"la clef publique %s est plus récente de %lu seconde que la signature\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6681,7 -5360,6 +6753,7 @@@ msgstr[0] "
msgstr[1] ""
"la clef publique %s est plus récente de %lu seconde que la signature\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6696,7 -5374,6 +6768,7 @@@ msgstr[1] "
"la clef %s a été créée %lu seconde dans le futur\n"
"(faille temporelle ou problème d'horloge)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6710,35 -5387,29 +6782,35 @@@ msgstr[1] "
"la clef %s a été créée %lu seconde dans le futur\n"
"(faille temporelle ou problème d'horloge)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, 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:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "clef %s : pas de sous-clef pour la signature de lien à la sous-clef\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
@@@ -6746,7 -5417,6 +6818,7 @@@
" la notation (chaîne trop grande).\n"
" Utilisation de la version non expansée.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6755,7 -5425,6 +6827,7 @@@ msgstr "
" l'URL de politique (chaîne trop grande).\n"
" Utilisation de la version non expansée.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6765,12 -5434,10 +6837,12 @@@ msgstr "
" l'URL du serveur de clef favori (chaîne trop grande).\n"
" Utilisation de la version non expansée.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s signature de : « %s »\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6778,42 -5445,34 +6850,42 @@@ msgstr "
"Attention : forcer l'algorithme de hachage %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "signature :"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "le chiffrement %s sera utilisé\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"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:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "« %s » a été ignorée : en double\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "ignoré : clef secrète déjà présente\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "enregistrement de confiance %lu, type %d : échec d'écriture : %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6822,320 -5481,257 +6894,320 @@@ msgstr "
"# Liste de valeurs de confiance définies, créée le %s\n"
"# (utilisez « gpg --import-ownertrust » pour les restaurer)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, c-format
msgid "error in '%s': %s\n"
msgstr "erreur dans « %s » : %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "ligne trop longue"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "deux-points manquant"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "empreinte incorrecte"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "valeur de confiance au propriétaire manquante"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "impossible de trouver l'enregistrement de confiance dans « %s » : %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, c-format
msgid "read error in '%s': %s\n"
msgstr "erreur de lecture dans « %s » : %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de confiance : échec de synchronisation : %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "impossible de créer un verrou pour « %s »\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, c-format
msgid "can't lock '%s'\n"
msgstr "impossible de verrouiller « %s »\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "enregistrement de base de confiance %lu : échec de lseek : %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
"enregistrement de base de confiance %lu : échec d'écriture (n=%d) : %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "transaction de base de confiance trop grande\n"
- #: 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"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s : le répertoire n'existe pas.\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "impossible d'accéder à « %s » : %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s : impossible de créer un enregistrement de version : %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s : base de confiance incorrecte créée\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s : base de confiance créée\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
msgid "Note: trustdb not writable\n"
msgstr "Remarque : la base de confiance n'est pas accessible en écriture\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s : base de confiance incorrecte\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s : échec de création de la table de hachage : %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s : erreur de mise à jour de l'enregistrement de version : %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s : erreur de lecture d'enregistrement de version : %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s : erreur d'écriture de l'enregistrement de version : %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de confiance : échec de lseek : %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "base de confiance : échec de lecture (n=%d) : %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s : ce n'est pas un fichier de base de confiance\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s : enregistrement de version avec le numéro %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s : version %d du fichier incorrecte\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s : erreur de lecture d'enregistrement libre : %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s : erreur d'écriture de l'enregistrement de répertoire: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s : échec de mise à zéro d'un enregistrement : %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s : impossible d'ajouter un enregistrement : %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "Erreur : la base de confiance est corrompue\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "impossible de traiter les lignes plus longues que %d caractères\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "la ligne d'entrée est plus longue que %d caractères\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "erreur d'envoi d'options standards : %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "algorithme non pris en charge : %s"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "erreur d'écriture en encodage base64 : %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "erreur d'initialisation de l'objet lecteur : %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "erreur d'ouverture de « %s » : %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "clef publique %s introuvable : %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
#| msgid "error setting OCSP target: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "erreur de configuration de la cible OCSP : %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "validité : %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "erreur de lecture des options stockées : %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "afficher les clefs"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7143,21 -5739,18 +7215,21 @@@ msgid_plural "%ld messages signed
msgstr[0] "indiquer les fonctions de hachage"
msgstr[1] "indiquer les fonctions de hachage"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7167,178 -5760,159 +7239,190 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "erreur de création d'un tube : %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "indiquer les fonctions de hachage"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "clef %s : acceptée comme clef de confiance\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "clef %s marquée de confiance ultime.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
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:431
++#: g10/trustdb.c:430
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:468
++#: g10/trustdb.c:467
#, 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:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "utilisation du modèle de confiance %s\n"
@@@ -7347,7 -5920,6 +7431,7 @@@
msgid "no need for a trustdb check\n"
msgstr "inutile de vérifier la base de confiance\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, 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"
@@@ -7399,7 -5963,6 +7483,7 @@@ msgstr "aucune clef de confiance ultim
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7407,30 -5970,24 +7491,30 @@@ 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:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
"impossible de mettre à jour l'enregistrement de version de la\n"
"base de confiance : échec d'écriture : %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "indéfinie"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "jamais"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "marginale"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "totale"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "ultime"
@@@ -7442,39 -5999,30 +7526,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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ révoquée]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[ expirée ]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ inconnue]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[indéfinie]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[marginale]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ totale ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ ultime ]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7484,14 -6032,12 +7568,14 @@@ msgstr "
"Veuillez vérifier que le fichier de signature (.sig ou .asc)\n"
"est bien le premier fichier indiqué sur la ligne de commande.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr ""
"la ligne d'entrée %u est trop longue ou un caractère de changement de\n"
"ligne manque\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "impossible d'ouvrir le descripteur %d : %s\n"
@@@ -7838,7 -6316,6 +7922,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:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
@@@ -7981,9 -6428,6 +8065,9 @@@ msgstr "nombre de certificats correspon
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "échec de recherche de clef seulement dans le cache du dirmngr : %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "impossible d'allouer la gestion de base de clefs\n"
@@@ -8482,7 -6821,6 +8566,7 @@@ msgstr "(ça ne ressemble pas à un mes
msgid "certificate '%s' not found: %s\n"
msgstr "certificat « %s » introuvable : %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "erreur de verrouillage du trousseau local : %s\n"
@@@ -8506,123 -6840,93 +8590,123 @@@ msgstr "échec de suppression du certif
msgid "no valid recipients given\n"
msgstr "aucune destinataire valable donnée\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "afficher les clefs externes"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "afficher la chaîne de certificats"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "importer les certificats"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "exporter les certificats"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "enregistrer une carte à puce"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "passer une commande au dirmngr"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "appeler gpg-protect-tool"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "créer une sortie encodée en base-64"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "entrée supposée au format PEM"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "entrée supposée au format base-64"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "entrée supposée au format binaire"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "ne pas consulter liste de révocations de cert."
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "vérifier la validité avec OCSP"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|nombre de certificats à inclure"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "ne pas vérifier les politiques de certificat"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "récupérer certificats d'émetteur manquants"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "ne pas utiliser du tout le terminal"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|FICHIER|écrire un journal serveur dans le FICHIER"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHIER|écrire un journal d'audit dans le FICHIER"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "mode automatique : aucune question"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "oui comme réponse à la plupart des questions"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "non comme réponse à la plupart des questions"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FICHIER|ajouter le trousseau à la liste de trousseaux"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|utiliser l'algorithme de hachage NOM"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Utilisation : @GPGSM@ [options] [fichiers] (-h pour l'aide)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8632,46 -6936,37 +8716,46 @@@ msgstr "
"Signer, vérifier, chiffrer ou déchiffrer en utilisant le protocole S/MIME\n"
"L'opération par défaut dépend des données entrées\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Remarque : ne sera pas capable de chiffrer à « %s » : %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "modèle de validation « %s » inconnu\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s : %u : aucun nom d'hôte donné\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s : %u : mot de passe donné sans utilisateur\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s : %u : ignorer cette ligne\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "impossible d'analyser le serveur de clefs\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importation des certificats commun « %s »\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "impossible de signer en utilisant « %s » : %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
@@@ -8688,7 -6980,6 +8772,7 @@@ msgstr "erreur de stockage du certifica
msgid "basic certificate checks failed - not imported\n"
msgstr "échec des vérifications de base du certificat — non importé\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "erreur de lecture des options stockées : %s\n"
@@@ -8703,31 -6992,25 +8787,31 @@@ msgstr "erreur d'importation du certifi
msgid "error reading input: %s\n"
msgstr "erreur de lecture de l'entrée : %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "impossible d'obtenir l'empreinte\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "problème de recherche de certificat existant : %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "impossible de trouver une base de clefs inscriptible : %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "erreur de stockage du certificat : %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "problème de nouvelle recherche de certificat : %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "erreur de stockage des options : %s\n"
@@@ -8919,7 -7169,6 +9003,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
msgid "certificate already cached\n"
msgstr "certificat déjà en cache\n"
@@@ -8927,8 -7175,6 +9011,8 @@@
msgid "certificate cached\n"
msgstr "certificat en cache\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, c-format
msgid "error caching certificate: %s\n"
msgstr "erreur de mise en cache du certificat : %s\n"
@@@ -9566,12 -7689,10 +9650,12 @@@ msgstr "attendre les certificats au for
msgid "force the use of the default OCSP responder"
msgstr "forcer utilisation du répondeur OCSP par défaut"
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9584,78 -7705,62 +9668,78 @@@ 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:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "erreur de lecture du certificat sur « %s » : %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr "certificat trop grand pour être possible\n"
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, c-format
msgid "lookup failed: %s\n"
msgstr "échec de la recherche : %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, 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:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr "un démon dirmngr fonctionne et est disponible\n"
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "échec de validation du certificat : %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
msgid "certificate is valid\n"
msgstr "le certificat est valable\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
msgid "certificate has been revoked\n"
msgstr "le certificat a été révoquée\n"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, c-format
msgid "certificate check failed: %s\n"
msgstr "échec de vérification du certificat : %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr "état obtenu : « %s »\n"
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "erreur d'écriture en encodage base64 : %s\n"
- #: dirmngr/dirmngr-client.c:685
++#: dirmngr/dirmngr-client.c:702
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "demande « %s » non prise en charge\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr "nom de fichier absolu attendu\n"
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr "recherche de « %s »\n"
@@@ -9811,13 -7882,11 +9895,13 @@@ msgstr "utilisation : %s [options]
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:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, 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:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr ""
@@@ -10297,76 -8264,60 +10381,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:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "échec d'assuan_inquire(%s) : %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr "ldapserver manquant"
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr "serialno manquant dans l'identifiant de certificat"
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "échec d'assuan_inquire : %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "échec de fetch_cert_by_url : %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, c-format
msgid "error sending data: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "échec de start_cert_fetch : %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "échec de fetch_next_cert : %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d dépassé\n"
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossible d'allouer une structure de contrôle : %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "échec d'allocation du contexte Assuan : %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "impossible d'initialiser le serveur : %s\n"
- #: dirmngr/server.c:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problème d'accept_assuan : %s\n"
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "problème de traitement Assuan : %s\n"
diff --cc po/gl.po
index 4484f53,7ea0c18..54dcdb0
--- a/po/gl.po
+++ b/po/gl.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.4\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio at trasno.net>\n"
"Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@@ -99,8 -83,6 +99,8 @@@ msgstr "Por favor, introduza o contrasi
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "contrasinal err�neo"
@@@ -156,25 -127,11 +156,25 @@@ msgstr "contrasinal err�neo
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -384,8 -302,6 +384,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "cambia-lo contrasinal"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -395,118 -311,87 +395,118 @@@ msgstr "
"Opci�ns:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "lareto"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ser un pouqui�o m�is calado"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "buscar chaves nun servidor de chaves"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualiza-la base de datos de confianza"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "non est� soportado"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -515,166 -400,126 +515,171 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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, informe dos erros no programa a <gnupg-bugs at gnu.org>,\n"
"e dos erros na traducci�n a <proxecto at trasno.net>.\n"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directorio creado\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, 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:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves omitidas\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -690,8 -533,6 +695,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -699,9 -540,6 +704,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -711,46 -549,38 +716,46 @@@ msgstr "
"Opci�ns:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "Cancelar"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -814,8 -634,6 +819,8 @@@ msgstr "
msgid "Yes"
msgstr "si|sim"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -845,46 -660,38 +850,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "cambia-lo contrasinal"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "habilitar unha chave"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -925,53 -725,42 +930,57 @@@ msgstr "o algoritmo de protecci�n %d%s
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro lendo `%s': %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "a actualizaci�n fallou: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "erro lendo `%s': %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "erro lendo `%s': %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "erro lendo `%s': %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -986,17 -773,18 +995,22 @@@ msgstr "problema de comunicaci�n con gp
msgid "problem setting the gpg-agent options\n"
msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "cancelado polo usuario\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
@@@ -1067,17 -841,18 +1081,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, fuzzy, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1409,7 -1117,6 +1428,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "non procesado"
@@@ -1419,22 -1125,14 +1438,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "atopou un erro ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "non se puido abrir un ficheiro: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
@@@ -1473,89 -1164,75 +1487,95 @@@ msgstr "non se atopou a chave p�blica %
msgid "waiting for lock %s...\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "cabeceira de armadura non v�lida: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "cabeceira de armadura: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "cabeceira de sinatura en claro non v�lida\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "cabeceira de armadura: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "sinaturas en texto claro ani�adas\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "armadura inesperada:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "li�a escapada cunha barra non v�lida: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "car�cter radix64 non v�lido %02x omitido\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "fin de ficheiro prematura (non hai CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "fin de ficheiro prematura (no CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "CRC mal formado\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Erro de CRC; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "error nunha li�a adicional\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "non se atoparon datos OpenPGP v�lidos.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
"erros\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "non lexible por humanos"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1563,84 -1240,73 +1583,95 @@@ msgstr "
"un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
"rematar en '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
+ "rematar en '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "non lexible por humanos"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, fuzzy, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "erro ao p�r '%s' na base de datos de confianza: %s\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Introduza o contrasinal: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "non se pode facer iso no modo por lotes\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Non se admite este comando no modo %s.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "�A s�a selecci�n? "
@@@ -1707,21 -1359,11 +1738,16 @@@ msgstr "non hai unha chave p�blica corr
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
@@@ -1819,13 -1442,10 +1845,13 @@@ msgstr "�Qu� tama�o de chave quere? (10
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "�Qu� tama�o de chave quere? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeado a %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1880,9 -1490,6 +1906,9 @@@ msgstr " (%d) RSA (s� cifrar)\n
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Selecci�n non v�lida.\n"
@@@ -1916,7 -1517,6 +1942,7 @@@ msgstr "�Asinar de verdade?
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "sa�r deste men�"
@@@ -1925,7 -1524,6 +1951,7 @@@
msgid "show admin commands"
msgstr "comandos conflictivos\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "amosar esta axuda"
@@@ -2009,133 -1589,103 +2035,133 @@@ msgstr "comandos conflictivos\n
msgid "Admin commands are not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Comando incorrecto (tente \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output non traballa con este comando\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "non se puido abrir `%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(a menos que especifique a chave por pegada dactilar)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
#, 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:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "�Borrar esta chave do chaveiro? "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, 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:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "chave"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "P�blica: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "borrouse a informaci�n de confianza\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "non se pode empregar un paquete sim�trico ESK debido ao modo S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "fallou a sinatura: %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' xa est� comprimido\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVISO: `%s' � un ficheiro baleiro\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "lendo de `%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2144,38 -1694,31 +2170,38 @@@ msgstr "
"forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
"destinatario\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "non se pode empregar %s no modo %s\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "non se pode empregar %s no modo %s\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "datos cifrados con %s\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado cun algoritmo desco�ecido %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado sim�trico.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problema ao manexa-lo paquete cifrado\n"
@@@ -2237,139 -1769,111 +2263,139 @@@ 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:79
++#: g10/export.c:78
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"A sinatura hase marcar coma non revocable.\n"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "chave secreta non utilizable"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "AVISO: non se exportou nada\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[Non se atopou o id de usuario]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "Pegada dactilar:"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "non se atopou a chave secreta `%s': %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "facer unha sinatura separada"
@@@ -2379,11 -1882,9 +2405,11 @@@
msgid "make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifrar datos"
@@@ -2391,15 -1891,12 +2417,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "cifrar s� con cifrado sim�trico"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "descifrar datos (por defecto)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verificar unha sinatura"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "ve-la lista de chaves"
@@@ -2412,15 -1907,12 +2438,15 @@@ msgstr "ve-la lista de chaves e sinatur
msgid "list and check key signatures"
msgstr "verifica-las sinaturas das chaves"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "ve-la lista de chaves e pegadas dactilares"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "ve-la lista de chaves secretas"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "xerar un novo par de chaves"
@@@ -2444,7 -1932,6 +2470,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "xerar un certificado de revocaci�n"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "borrar chaves do chaveiro p�blico"
@@@ -2476,7 -1957,6 +2502,7 @@@ msgstr "asinar unha chave localmente
msgid "sign or edit a key"
msgstr "asinar ou editar unha chave"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "cambia-lo contrasinal"
@@@ -2526,24 -1995,19 +2552,24 @@@ msgstr "actualiza-la base de datos de c
msgid "print message digests"
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crear sa�da con armadura en ascii"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "empregar este id de usuario para asinar ou descifrar"
@@@ -2557,12 -2019,10 +2583,12 @@@ msgstr "|N|axusta-lo nivel de compresi�
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "non facer ning�n cambio"
@@@ -2574,7 -2032,6 +2600,7 @@@ msgstr "avisar antes de sobrescribir
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2582,7 -2039,6 +2608,7 @@@ msgstr "
"@\n"
"(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2602,13 -2058,11 +2628,13 @@@ msgstr "
" --list-keys [nomes] amosa-las chaves\n"
" --fingerprint [nomes] amosa-las pegadas dactilares\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2623,7 -2077,6 +2649,7 @@@ msgstr "
"asinar, verificar, cifrar ou descifrar\n"
"a operaci�n por defecto depende dos datos de entrada\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2631,602 -2084,473 +2657,602 @@@ msgstr "
"\n"
"Algoritmos soportados:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "P�blica: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Compresi�n: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opci�ns] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, 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:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, 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:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "amosar en que chaveiro est� unha chave listada"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "deshabilitar unha chave"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, 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:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, 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:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, 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:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "non se puido estabrecer exec-path a %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, 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:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s non se admite con %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser superior a 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser superior a 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
#, 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:3517
++#: g10/gpg.c:3524
#, 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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "preferencias por defecto non v�lidas\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "preferencias de cifrado personais non v�lidas\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "preferencias de resumo personais non v�lidas\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "preferencias de compresi�n personais non v�lidas\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�%s a�nda non traballa con %s!\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, 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:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [ficheiro]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [ficheiro]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [ficheiro]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [ficheiro]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ficheiro]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [ficheiro]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [ficheiro]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key id-de-usuario"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key id-de-usuario"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-de-usuario [comandos]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-de-usuario"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "o env�o ao servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "a recepci�n do servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "a exportaci�n da chave fallou: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "a exportaci�n da chave fallou: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "a busca no servidor de chaves fallou fallou: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "non se puido quita-la armadura: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, 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:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[ficheiro]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Escriba a s�a mensaxe ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
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:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@@ -3240,7 -2562,6 +3266,7 @@@ msgstr "toma-las chaves deste chaveiro
msgid "make timestamp conflicts only a warning"
msgstr "converte-los conflictos de selo de data nun aviso"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|DF|escribi-la informaci�n de estado a este DF"
@@@ -3267,330 -2584,264 +3293,330 @@@ msgstr "Non hai axuda dispo�ible
msgid "No help available for '%s'"
msgstr "Non hai axuda dispo�ible para `%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualiza-la base de datos de confianza"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualiza-la base de datos de confianza"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chave secreta non utilizable"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "pasando por alto un bloque de tipo %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves procesadas hasta polo momento\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total procesado: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr "novas chaves omitidas: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "novas chaves omitidas: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin IDs de usuario: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de usuario: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas sub-chaves: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas sinaturas: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revocaci�ns de chaves: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr "chaves secretas lidas: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chaves secretas importadas: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chaves secretas sin cambios: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " non importadas: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas sinaturas: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr "chaves secretas lidas: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "om�tese `%s': %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica non atopada: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: nova chave - omitida\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, 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:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chave %08lX: non coincide coa nosa copia\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, 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:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, 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:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" sen cambios\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "non se atopou a chave secreta `%s': %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3605,206 -2856,184 +3631,226 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, 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:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, 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:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, 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:2137
++#: g10/import.c:2136
#, 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:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: omitido o ID de usuario '"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: omitida a sub-chave\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "chaveiro `%s' creado\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "chaveiro `%s' creado\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revocaci�n]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[auto-sinatura]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d sinaturas err�neas\n"
- msgstr[1] "%d sinaturas err�neas\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "Sinatura %s, algoritmo de resumo %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "Sinatura correcta de \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "om�tese `%s': %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "O ID de usuario \"%s\" est� revocado."
+ msgstr[1] "O ID de usuario \"%s\" est� revocado."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3812,23 -3041,25 +3858,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 sinatura non verificada debido a unha chave que falta\n"
msgstr[1] "1 sinatura non verificada debido a unha chave que falta\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 sinatura non verificada debido a un erro\n"
- msgstr[1] "1 sinatura non verificada debido a un erro\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d sinaturas err�neas\n"
+ msgstr[1] "%d sinaturas err�neas\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
- msgstr[1] "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Sinatura correcta de \""
+ msgstr[1] "Sinatura correcta de \""
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3840,68 -3071,53 +3892,68 @@@ msgstr "
"correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
"comprobando pegadas dactilares de varias fontes...).\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Conf�o marxinalmente\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Conf�o totalmente\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "O ID de usuario \"%s\" est� revocado."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�Est� seguro de que quere asinalo? (s/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Non se puido asinar.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "O ID de usuario \"%s\" est� caducado."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, 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:722
++#: g10/keyedit.c:1235
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "�Asinar de verdade? "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3910,11 -3126,9 +3962,11 @@@ msgstr "
"A auto-sinatura de \"%s\"\n"
"� unha sinatura tipo PGP 2.x\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3923,11 -3137,9 +3975,11 @@@ msgstr "
"A s�a sinatura actual en \"%s\"\n"
"caducou.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3936,43 -3148,34 +3988,43 @@@ msgstr "
"A s�a sinatura actual en \"%s\"\n"
"� unha sinatura local.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
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:855
++#: g10/keyedit.c:1368
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada que asinar coa chave %08lX\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "�Esta chave caducou!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave ha caducar o %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3981,32 -3184,26 +4033,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:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Non hei respostar.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Non o comprobei en absoluto.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Fixen algunhas comprobaci�ns.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4015,275 -3212,217 +4067,271 @@@ msgstr "
"�Esta seguro de que quere asinar esta chave\n"
"coa s�a chave: \""
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Esta ha ser unha auto-sinatura.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, 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:1010
++#: g10/keyedit.c:1523
#, 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:1020
++#: g10/keyedit.c:1533
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"A sinatura hase marcar coma non exportable.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"A sinatura hase marcar coma non revocable.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Non se comprobou esta chave en absoluto.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Comprobouse esta chave de xeito informal.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Comprobouse esta chave con moito tino.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "�Asinar de verdade? "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "movendo a sinatura dunha chave � seu sitio\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "gardar e sa�r"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "amosar fingerprint"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Notaci�n de sinaturas: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "listar chave e IDs de usuario"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "selecciona-lo ID de usuario N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "selecciona-lo ID de usuario N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "revocar sinaturas"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "asina-la chave localmente"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "engadir un ID de usuario"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "engadir unha identificaci�n fotogr�fica"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "borrar un ID de usuario"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "borrar unha chave secundaria"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "engadir unha chave de revocaci�n"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
#, 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:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marcar un ID de usuario coma primario"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "lista-las preferencias (expertos)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "lista-las preferencias (moitos datos)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, 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:1441
++#: g10/keyedit.c:1907
#, 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:1443
++#: g10/keyedit.c:1909
#, 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:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "cambia-lo contrasinal"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "cambia-la confianza sobre o dono"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revocar un ID de usuario"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revocar unha chave secundaria"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "habilitar unha chave"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "deshabilitar unha chave"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "amosa-la identificaci�n fotogr�fica"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "A chave secreta est� disponible.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "C�mpre a chave secreta para facer isto.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4291,269 -3430,217 +4339,275 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "A chave est� revocada."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "clase de sinatura desco�ecida"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar alomenos un ID de usuario.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
#, 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:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "�Seguro de que quere borrar este ID de usuario? "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Debe seleccionar alomenos unha chave.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar alomenos unha chave.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, 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:2031
++#: g10/keyedit.c:2497
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "�Seguro de que quere borrar esta chave? "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
#, 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:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "�Seguro de que quere revocar este ID de usuario? "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "�Realmente quere revocar esta chave? "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "�Realmente quere revoca-las chaves seleccionadas? "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "�Realmente quere revocar esta chave? "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "estabrece-la lista de preferencias"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, 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:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "�Realmente desexa actualiza-las preferencias? "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "�Garda-los cambios? "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "�Sa�r sin gardar? "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "erro: pegada dactilar non v�lida\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, 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:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "valor non v�lido\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Non hai tal ID de usuario.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nada que asinar coa chave %08lX\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Resumo: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Caracter�sticas: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Notaci�n: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr " (sensible)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "non foi posible crear %s: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocada] "
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, fuzzy, c-format
msgid "usage: %s"
msgstr " confianza: %c/%c"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confianza: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Esta chave est� desactivada"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4561,19 -3648,14 +4615,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revocada] "
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4581,17 -3663,14 +4635,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4600,37 -3679,29 +4654,37 @@@ msgstr "
"AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
" fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�Est� seguro de que quere engadila? (s/N) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "�Borrar esta sinatura correcta? (s/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4638,38 -3709,31 +4692,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Borrada %d sinatura.\n"
msgstr[1] "Borrada %d sinatura.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Non se borrou nada.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
#, fuzzy
msgid "invalid"
msgstr "armadura non v�lida"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "O ID de usuario \"%s\" est� revocado."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "O ID de usuario \"%s\" est� revocado."
msgstr[1] "O ID de usuario \"%s\" est� revocado."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4679,43 -3743,35 +4733,43 @@@ msgstr "
"designado\n"
" pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduza o ID de usuario do revocador designado: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
#, 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:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4723,238 -3779,188 +4777,238 @@@
msgstr ""
"�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Escolla exactamente un ID de usuario.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�Est� seguro de que quere empregala (s/N)? "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�Est� seguro de que quere empregala (s/N)? "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Notaci�n de sinaturas: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "�Sobrescribir? (s/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usuario: \""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta sinatura caducou o %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�Est� seguro de que quere revocala? (s/N) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
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:5232
++#: g10/keyedit.c:5856
#, fuzzy
msgid "Not signed by you.\n"
msgstr " asinada por %08lX no %s%s\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Asinou estes IDs de usuario: \n"
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocada por %08lX no %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Est� a punto de revocar estas sinaturas:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "non hai chave secreta\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "preferencia %c%lu duplicada\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "demasiadas preferencias `%c'\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "demasiadas preferencias `%c'\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "demasiadas preferencias `%c'\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "caracter non v�lido na cadea de preferencias\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "escribindo unha sinatura directa\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "escribindo a propia sinatura\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "escribindo unha sinatura que liga a chave\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tama�o de chave non v�lido; empregando %u bits\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tama�o de chave redondeado a %u bits\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "cifrar datos"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -4968,157 -3974,126 +5022,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (s� cifrar)\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Por favor, seleccione o tipo de chave que quere:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA e ElGamal (por defecto)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA e ElGamal (por defecto)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (s� asinar)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (s� asinar)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (s� cifrar)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (s� cifrar)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (s� cifrar)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (s� cifrar)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA e ElGamal (por defecto)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (s� asinar)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (s� cifrar)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (s� cifrar)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (s� cifrar)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notaci�n de sinaturas: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "�Qu� tama�o de chave quere? (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "�Qu� tama�o de chave quere? (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tama�o de chave requerido son %u bits\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "redondeado a %u bits\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Por favor, seleccione o tipo de chave que quere:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5134,7 -4109,6 +5188,7 @@@ msgstr "
" <n>m = a chave caduca en n meses\n"
" <n>y = a chave caduca en n anos\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5150,40 -4124,32 +5204,40 @@@ msgstr "
" <n>m = a sinatura caduca en n meses\n"
" <n>y = a sinatura caduca en n anos\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "�Por canto tempo � v�lida a chave? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "�Por canto tempo � v�lida a sinatura? (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "valor non v�lido\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s non caduca nunca\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s non caduca nunca\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s caduca o %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "A sinatura caduca o %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5191,12 -4157,10 +5245,12 @@@ msgstr "
"O seu sistema non pode amosar datas m�is al� do 2038.\n"
"A�nda as�, hase tratar correctamente ata o 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "�Isto � correcto? (s/n) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5207,7 -4171,6 +5261,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5224,50 -4187,39 +5278,50 @@@ msgstr "
" \"Heinrich Heime (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Nome: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Caracter non v�lido no nome\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "O nome non pode comezar cun d�xito\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "O nome debe ter alomenos 5 caracteres\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Enderezo de E-mail: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Non � un enderezo de e-mail v�lido\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Comentario: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Car�cter non v�lido no comentario\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5278,7 -4230,6 +5332,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5294,35 -4245,28 +5348,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeAaSs"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Por favor, corrixa antes o erro\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5334,12 -4278,10 +5388,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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A xeraci�n da chave fallou: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5347,68 -4289,55 +5401,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' xa est� comprimido\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "�Crear de t�dolos xeitos? "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "�Crear de t�dolos xeitos? "
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Cancelouse a xeraci�n de chaves.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, 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:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
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:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5418,7 -4347,6 +5472,7 @@@ msgstr "
"queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
"con esa finalidade.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5426,7 -4354,6 +5480,7 @@@ msgstr "
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5434,51 -4361,40 +5488,51 @@@ msgstr "
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
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:4298
++#: g10/keygen.c:4324
#, 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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "�Crear realmente? "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "nunca "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Normativa de sinaturas cr�ticas: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Normativa de sinaturas: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Notaci�n de sinaturas cr�ticas: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Notaci�n de sinaturas: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5486,62 -4402,57 +5540,70 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d sinaturas err�neas\n"
msgstr[1] "%d sinaturas err�neas\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 sinatura non verificada debido a un erro\n"
+ msgstr[1] "1 sinatura non verificada debido a un erro\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Chaveiro"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "om�tese `%s': %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " Pegada dactilar ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "comprobando o chaveiro `%s'\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu chaves comprobadas (%lu sinaturas)\n"
msgstr[1] "%lu chaves comprobadas (%lu sinaturas)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, fuzzy, c-format
#| msgid "\t%lu keys updated\n"
msgid "%lu key cached"
@@@ -5549,7 -4460,6 +5611,7 @@@ msgid_plural "%lu keys cached
msgstr[0] "\t%lu chaves actualizadas\n"
msgstr[1] "\t%lu chaves actualizadas\n"
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5557,529 -4467,422 +5619,529 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 sinatura err�nea\n"
msgstr[1] "1 sinatura err�nea\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: chaveiro creado\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, 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:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, 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:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: non � un ID de chave v�lido\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "solicitando a chave %08lX de %s\n"
msgstr[1] "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
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:1700
++#: g10/keyserver.c:1699
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"asinado coa s�a chave %08lX no %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "chave de sesi�n cifrada con %s\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "cifrado cun algoritmo desco�ecido %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "a chave p�blica � %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrado cunha chave %s, ID %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "fallou o descifrado de chave p�blica: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifrado con %lu contrasinais\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "cifrado con 1 contrasinal\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "supo�endo datos cifrados con %s\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "A cifra IDEA non est� dispo�ible, t�ntase empregar %s no seu canto\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "descifrado correcto\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome do ficheiro orixinal='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "Sinatura correcta de \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Sinatura INCORRECTA de\""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Sinatura caducada de \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Sinatura correcta de \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "verificaci�n de sinatura suprimida\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "non se poden manexar estas sinaturas m�ltiples\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Chave dispo�ible en: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[incerto]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "A sinatura caduca o %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binario"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "modo texto"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "desco�ecido"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo de chave p�blica desco�ecido"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Non foi posible verifica-la sinatura: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "non � unha sinatura separada\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "sinatura independiente de clase 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "Sinatura � vello estilo (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, 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:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
#, 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:302
++#: g10/misc.c:300
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "algoritmo de cifrado non implementado"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, 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:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "erro de lectura: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "erro de lectura: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "empregue \"%s%s\" no seu canto\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Sen comprimir"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "Sen comprimir"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "lendo as opci�ns de `%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "clase de sinatura desco�ecida"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "O ficheiro `%s' xa existe. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "�Sobrescribir? (s/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: sufixo desco�ecido\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Introduza o novo nome de ficheiro"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "escribindo na sa�da est�ndar\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "suponse que hai datos asinados en `%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID principal da chave %08lX)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6092,15 -4895,12 +6154,15 @@@ msgstr "
"\"%.*s\"\n"
"Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Introduza o contrasinal\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "cancelado polo usuario\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6110,47 -4910,38 +6172,47 @@@ msgstr "
"Necesita un contrasinal para desbloquea-la chave secreta para\n"
"o usuario \""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bits, chave %s, ID %08lX, creada %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6206,31 -4989,24 +6268,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Non se especificou un motivo"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "A chave � obsoleta"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Esta chave quedou descoberta"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Xa non se emprega esta chave"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "O ID de usuario xa non � v�lido"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "motivo para a revocaci�n: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "comentario de revocaci�n: "
@@@ -6244,100 -5020,81 +6306,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMsSoO"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, 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:259
++#: g10/pkclist.c:258
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " alias \""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, 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:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Non sei\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NON conf�o\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Conf�o absolutamente\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = voltar ao men� principal\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " o = omitir esta chave\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " s = sa�r\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "�A s�a decisi�n? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, 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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Esta chave probablemente pertenza ao propietario\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Esta chave pert�ncenos a n�s\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6349,135 -5106,107 +6411,135 @@@ msgstr "
"respostar � seguinte pregunta cun \"si\"\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "�Empregar esta chave de t�dolos xeitos?"
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "AVISO: �Empr�gase unha chave que non � de confianza!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
#, 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:547
++#: g10/pkclist.c:562
#, 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:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Isto pode significar que a sinatura est� falsificada.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta chave est� desactivada.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Nota: �Esta chave xa caducou!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVISO: �Esta chave NON � de confianza!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Probablemente, a sinatura estea FALSIFICADA.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitido: a chave p�blica est� desactivada\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitido: a chave p�blica xa est� presente\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "non se puido conectar a `%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6485,168 -5214,132 +6547,168 @@@ msgstr "
"\n"
"Introduza o ID de usuario. Remate cunha li�a en branco: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Non hai tal ID de usuario.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "A chave p�blica est� desactivada.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "omitido: chave p�blica xa estabrecida\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "non hai enderezos v�lidos\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Sinatura non adxunta.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Por favor, introduza o nome do ficheiro de datos: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "lendo de stdin ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "non hai datos asinados\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "non foi posible abri-los datos asinados `%s'\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinatario an�nimo; tentando a chave secreta %08lX ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "vale, n�s somo-lo destinatario an�nimo.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "a codificaci�n vella do DEK non est� soportada\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "o algoritmo de cifrado %d%s � desco�ecido ou est� desactivado\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "a chamada a build_packet fallou: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Ha ser revocada por:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Esta � unha chave de revocaci�n sensible)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, 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
++#: g10/revoke.c:327
#, 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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "Forzouse unha sa�da con armadura ASCII.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "a chamada a make_keysig_packet fallou: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Creouse o certificado de revocaci�n.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, 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:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6655,20 -5348,17 +6717,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Creouse o certificado de revocaci�n.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "non se atopou a chave secreta `%s': %s\n"
@@@ -6676,23 -5366,19 +6738,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6710,94 -5396,76 +6772,94 @@@ 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:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Por favor, escolla o motivo da revocaci�n:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Cancelar"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(probablemente queira seleccionar %d aqu�)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Motivo para a revocaci�n: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Non se deu unha descrici�n)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "�� correcto? "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "creouse unha chave feble - volvendo a tentalo\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
"veces\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = amosar m�is informaci�n\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
msgstr[1] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
msgstr[1] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6810,7 -5478,6 +6872,7 @@@ msgstr[1] "
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6822,104 -5489,86 +6884,104 @@@ msgstr[1] "
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: a chave est� revocada"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "chave %08lX: non hai sub-chave para a sinatura da ligaz�n da chave\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVISO: non se pode expandir-%% a notaci�n (grande de m�is). �sase sen "
"expandir.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "Sinatura %s de: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "asinando:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "hase empregar cifrado %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"a chave non est� marcada coma insegura - non se pode empregar co xerador de "
"n�meros aleatorios falso\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "om�tese `%s': duplicada\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "om�tese: a chave secreta xa est� presente\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6928,341 -5577,275 +6990,341 @@@ msgstr "
"# Lista de valores de confianza asignados, creada o %s\n"
"# (Empregue \"gpg --import-ownertrust\" para restauralos)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "li�a longa de m�is\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "erro: pegada dactilar non v�lida\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr "importa-los valores de confianza no propietario"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "erro ao buscar un rexistro de confianza: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "erro de lectura: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "non se pode crear `%s': %s\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "non se puido abrir `%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
"rexistro da base de datos de confianza %lu: fallou a escritura (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
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:606
- #, fuzzy, c-format
- msgid "can't access '%s': %s\n"
- msgstr "non se pode pechar `%s': %s\n"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: �o directorio non existe!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, fuzzy, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "non se pode pechar `%s': %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: non se puido crea-lo rexistro de versi�n: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: creouse a base de datos de confianza\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: base de datos de confianza non v�lida\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: erro ao actualiza-lo rexistro de versi�n: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: erro ao escribi-lo rexistro de versi�n: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de datos de confianza: lseek fallou: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: non � un ficheiro de base de datos de confianza\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: rexistro de versi�n con n�mero de rexistro %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versi�n do ficheiro incorrecta %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: erro ao ler un rexistro libre: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: non se puido p�r a cero un rexistro: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: non se puido engadir un rexistro: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: creouse a base de datos de confianza\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "non � posible manexar li�as de texto maiores que %d caracteres\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmos soportados:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "non se atopou a chave p�blica %08lX: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Normativa: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "ve-la lista de chaves"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7272,174 -5855,154 +7334,185 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "chave %08lX: aceptada como chave de confianza\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "chave marcada coma de confianza absoluta.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7448,7 -6010,6 +7521,7 @@@
msgid "no need for a trustdb check\n"
msgstr "non se precisa comproba-la base de datos de confianza\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "hase comproba-la base de datos de confianza o %s\n"
@@@ -7495,35 -6048,28 +7568,35 @@@ msgstr "non se atoparon chaves de confi
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, 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"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
#, fuzzy
msgid "never"
msgstr "nunca "
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7535,42 -6081,33 +7608,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "[revocada] "
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "[caducada ]"
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "desco�ecido"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7580,13 -6117,11 +7653,13 @@@ msgstr "
"Por favor, lembre que o ficheiro de sinatura (.sig ou .asc) deber�a\n"
"se-lo primeiro ficheiro que se indique na li�a de comandos.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr ""
"a li�a de entrada %u � longa de m�is ou f�ltalle a marca de fin de li�a\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "non se puido abrir `%s': %s\n"
@@@ -7916,7 -6383,6 +7989,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:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8061,9 -6497,6 +8134,9 @@@ msgstr "erro ao crea-lo contrasinal: %s
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@@ -8584,7 -6912,6 +8657,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
@@@ -8609,134 -6932,104 +8682,134 @@@ msgstr "fallou o borrado do bloque de c
msgid "no valid recipients given\n"
msgstr "(Non se deu unha descrici�n)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "ve-la lista de chaves secretas"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "Revocaci�n de certificado v�lida"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "Certificado correcto"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "Certificado correcto"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crear sa�da con armadura en ascii"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "non usa-la terminal en absoluto"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "modo por lotes: non preguntar nunca"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "asumir `si' na maior�a das preguntas"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "asumir `non' na maior�a das preguntas"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "engadir este chaveiro � lista de chaveiros"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8747,47 -7040,38 +8820,47 @@@ msgstr "
"asinar, verificar, cifrar ou descifrar\n"
"a operaci�n por defecto depende dos datos de entrada\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "non se puido conectar a `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Non se deu unha descrici�n)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " o = omitir esta chave\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "escribindo a `%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8805,7 -7086,6 +8878,7 @@@ msgstr "Certificado correcto
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -8820,32 -7098,26 +8893,32 @@@ msgstr "erro ao crea-lo contrasinal: %s
msgid "error reading input: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -9024,7 -7263,6 +9097,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "Creouse o certificado de revocaci�n.\n"
@@@ -9034,8 -7271,6 +9107,8 @@@
msgid "certificate cached\n"
msgstr "Revocaci�n de certificado v�lida"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -9648,13 -7760,11 +9721,13 @@@ msgstr "Certificado correcto
msgid "force the use of the default OCSP responder"
msgstr "Introduza o ID de usuario do revocador designado: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9662,85 -7772,69 +9735,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "Revocaci�n de certificado v�lida"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "NOTA: a chave est� revocada"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritmos soportados:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9895,12 -7955,10 +9968,12 @@@ msgstr "uso: gpg [opci�ns]
msgid "colons are not allowed in the socket name\n"
msgstr "�%s non se admite con %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
@@@ -10395,77 -8351,61 +10468,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/gnupg2.pot
index d5a62e2,970241e..1cf85ff
--- 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.11\n"
-"Project-Id-Version: gnupg 1.4.3\n"
++"Project-Id-Version: GNU gnupg 2.1.12\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+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"
-"Language: nb\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=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
@@@ -97,13 -87,10 +97,13 @@@ msgstr "
msgid "PIN:"
msgstr ""
-#, fuzzy
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
-msgstr "ugyldig passfrase"
+msgstr ""
+#: agent/call-pinentry.c:938 agent/command-ssh.c:3237 agent/genkey.c:416
+#: tools/symcryptrun.c:442
msgid "does not match - try again"
msgstr ""
@@@ -148,34 -131,20 +148,34 @@@ msgstr "
msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
-#, fuzzy, c-format
-#| msgid "can't create `%s': %s\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
+#, c-format
msgid "can't create '%s': %s\n"
-msgstr "kan ikke opprette �%s�: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "can't open `%s': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:2535 agent/command-ssh.c:2553
+#, 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:2539
#, 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:3712
+#, 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:1270
-#, fuzzy
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
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:1271
-#, fuzzy
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
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.
@@@ -351,280 -303,226 +351,285 @@@ msgstr "
msgid "Warning: You have entered an insecure passphrase."
msgstr ""
-#, fuzzy, c-format
+#: agent/genkey.c:480
+#, c-format
msgid "Please enter the passphrase to%0Aprotect your new key"
msgstr ""
-"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
-"\n"
-#, fuzzy
+#: agent/genkey.c:606
msgid "Please enter the new passphrase"
-msgstr "endre passfrasen"
+msgstr ""
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
-#, fuzzy
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
msgstr ""
-"@\n"
-"Valg:\n"
-" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
-msgstr "fyldig output"
+msgstr ""
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
-msgstr "v�re noenlunde stille"
+msgstr ""
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
-#, fuzzy
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
-#, fuzzy
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
-msgstr "s�ke etter n�kler p� en n�kkelserver"
+msgstr ""
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
-#, fuzzy
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
-msgstr "ikke oppdat�r tillitsdatabasen etter import"
+msgstr ""
- #: agent/gpg-agent.c:180
-#, fuzzy
++#: agent/gpg-agent.c:181
msgid "|NAME|accept some commands via NAME"
-msgstr "|NAVN|kryptere for NAVN"
+msgstr ""
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
-#, fuzzy
++#: agent/gpg-agent.c:218
msgid "disallow the use of an external password cache"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
-#, fuzzy
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
msgid "enable ssh support"
msgstr ""
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr ""
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
-#, fuzzy
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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 ""
- #: agent/gpg-agent.c:480
-#, fuzzy
++#: agent/gpg-agent.c:482
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
-msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+msgstr ""
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
-#, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
-#, fuzzy, c-format
-#| msgid "reading options from `%s'\n"
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: dirmngr/dirmngr.c:908
+#, c-format
msgid "reading options from '%s'\n"
-msgstr "leser valg fra �%s�\n"
+msgstr ""
- #: agent/gpg-agent.c:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
- #: agent/gpg-agent.c:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
-#, fuzzy
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
-#, fuzzy, c-format
-#| msgid "can't create directory `%s': %s\n"
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
-#, fuzzy, c-format
-#| msgid "directory `%s' created\n"
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
+#, c-format
msgid "directory '%s' created\n"
-msgstr "katalogen �%s� ble opprettet\n"
+msgstr ""
- #: agent/gpg-agent.c:1956
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1916
++#, c-format
+ msgid "can't set permissions of '%s': %s\n"
-msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
++msgstr ""
+
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1964
+#, c-format
msgid "stat() failed for '%s': %s\n"
-msgstr "fstat(%d) mislyktes in %s: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1960
-#, fuzzy, c-format
++#: agent/gpg-agent.c:1968
+#, c-format
msgid "can't use '%s' as home directory\n"
-msgstr "kan ikke opprette katalogen �%s�: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
-#, fuzzy, c-format
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
-#, fuzzy, c-format
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
-#, fuzzy, c-format
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
+#, c-format
msgid "%s %s stopped\n"
-msgstr "%s: hoppet over: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr ""
@@@ -638,97 -535,83 +643,97 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
msgstr ""
-"@Kommandoer:\n"
-" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
" "
msgstr ""
-"@\n"
-"Valg:\n"
-" "
- #: agent/protect-tool.c:151
-#, fuzzy
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
-msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+msgstr ""
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr ""
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
-#, fuzzy
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
-msgstr "cancel|cancel"
+msgstr ""
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
-#, fuzzy, c-format
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
+#, c-format
msgid "error while asking for the passphrase: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
-#, 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 ""
@@@ -747,12 -629,10 +752,12 @@@ msgid "
"certificates?"
msgstr ""
-#, fuzzy
+#: agent/trustlist.c:663 common/audit.c:467
msgid "Yes"
-msgstr "ja"
+msgstr ""
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -782,44 -659,40 +787,44 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
-#, fuzzy
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
-msgstr "endre passfrasen"
+msgstr ""
- #: agent/findkey.c:175
++#: agent/findkey.c:289
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) "
++#: agent/findkey.c:1425
+#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
-msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
+msgstr ""
- #: agent/findkey.c:1290 agent/findkey.c:1304
-#, fuzzy
-#| msgid "enable key"
++#: agent/findkey.c:1449 agent/findkey.c:1463
msgid "Delete key"
-msgstr "innkoble en n�kkel"
+msgstr ""
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -842,73 -711,59 +847,77 @@@ 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 ""
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
-#, fuzzy, c-format
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
+#, c-format
msgid "error creating a pipe: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
-#, fuzzy, c-format
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#, c-format
msgid "error creating a stream for a pipe: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
-#, fuzzy, c-format
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 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
-#, fuzzy, c-format
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+#, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
-msgstr "oppdatering mislyktes: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:548
-#, fuzzy, c-format
++#: common/exechelp-posix.c:589
+#, c-format
msgid "error running '%s': probably not installed\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
-#, fuzzy, c-format
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
+#, c-format
msgid "error running '%s': exit status %d\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:562
-#, fuzzy, c-format
++#: common/exechelp-posix.c:604
+#, c-format
msgid "error running '%s': terminated\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
-#, fuzzy, c-format
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
+#, c-format
msgid "error getting exit code of process %d: %s\n"
-msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+msgstr ""
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
-#, fuzzy, c-format
-#| msgid "can't close `%s': %s\n"
+#: common/simple-pwquery.c:376
+#, c-format
msgid "can't connect to '%s': %s\n"
-msgstr "kan ikke lukke �%s�: %s\n"
+msgstr ""
+#: common/simple-pwquery.c:387
msgid "communication problem with gpg-agent\n"
msgstr ""
@@@ -916,15 -770,16 +925,20 @@@
msgid "problem setting the gpg-agent options\n"
msgstr ""
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr ""
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr ""
++#: common/simple-pwquery.c:697
+ #, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr ""
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr ""
@@@ -994,17 -835,18 +1008,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
-#, fuzzy, c-format
++#: common/miscellaneous.c:115 g10/card-util.c:799 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 ""
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1295,46 -1107,34 +1314,41 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
-#, fuzzy
++#: common/argparse.c:401 g10/tofu.c:1660 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 ""
-
- #: common/utf8conv.c:116
-#, fuzzy, c-format
++#: common/utf8conv.c:123
+#, c-format
msgid "conversion from '%s' to '%s' not available\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
- #: common/utf8conv.c:124
-#, fuzzy, c-format
++#: common/utf8conv.c:131
+#, c-format
msgid "iconv_open failed: %s\n"
-msgstr "signering mislyktes: %s\n"
+msgstr ""
- #: common/utf8conv.c:378 common/utf8conv.c:644
-#, fuzzy, c-format
++#: common/utf8conv.c:385 common/utf8conv.c:651
+#, 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:707
+#, 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:771
+#, c-format
msgid "error writing to '%s': %s\n"
-msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+msgstr ""
+#: common/dotlock.c:1116
#, c-format
msgid "removing stale lockfile (created by %d)\n"
msgstr ""
@@@ -1348,343 -1146,269 +1362,347 @@@ msgstr "
msgid "(deadlock?) "
msgstr ""
-#, fuzzy, c-format
+#: common/dotlock.c:1192
+#, c-format
msgid "lock '%s' not made: %s\n"
-msgstr "fant ikke offentlig n�kkel %s: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: common/dotlock.c:1219
+#, c-format
msgid "waiting for lock %s...\n"
-msgstr "venter p� l�sing av �%s� ...\n"
+msgstr ""
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
-msgstr "armor: %s\n"
+msgstr ""
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
-msgstr "ugyldig armorheader: "
+msgstr ""
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
-msgstr "armorheader: "
+msgstr ""
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
-msgstr "ugyldig clearsigheader\n"
+msgstr ""
- #: g10/armor.c:453
-#, fuzzy
++#: g10/armor.c:493
msgid "unknown armor header: "
-msgstr "armorheader: "
+msgstr ""
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
-msgstr "n�stede klartekstsignaturer\n"
+msgstr ""
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
-msgstr "uforventet armering:"
+msgstr ""
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
-msgstr "ugyldig bindestrekbeskyttet linje: "
+msgstr ""
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
-msgstr "hoppet over ugyldig radix64-tegn %02x\n"
+msgstr ""
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
-msgstr "for tidlig eof (ingen CRC)\n"
+msgstr ""
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
-msgstr "for tidlig eof (i CRC)\n"
+msgstr ""
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
-msgstr "misdannet CRC\n"
+msgstr ""
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
-msgstr "CRC-feil; %06lX - %06lX\n"
+msgstr ""
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
-msgstr "for tidlig eof (i trailer)\n"
+msgstr ""
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
-msgstr "feil i trailerlinje\n"
+msgstr ""
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
-msgstr "ingen gyldig OpenPGP-data funnet.\n"
+msgstr ""
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
-msgstr "ugyldig armor: linje lengre enn %d tegn\n"
+msgstr ""
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
-"quoted printable-tegn i armor - antakelig har en MTA med feil blitt brukt\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, c-format
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr ""
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr ""
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr ""
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr ""
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
- msgid "WARNING: invalid notation data found\n"
++#: g10/build-packet.c:1235
+ msgid "a notation name may not contain an '=' character\n"
msgstr ""
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
++#: g10/build-packet.c:1241
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+
-#, fuzzy
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
+ msgid "WARNING: invalid notation data found\n"
-msgstr "ingen gyldig OpenPGP-data funnet.\n"
+msgstr ""
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
-msgstr "Tast inn passfrase: "
+msgstr ""
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
+#, c-format
msgid "error getting version from '%s': %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
-#, fuzzy, c-format
-#| msgid "WARNING: %s overrides %s\n"
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
+#, c-format
msgid "WARNING: %s\n"
-msgstr "ADVARSEL: %s overstyrere %s\n"
+msgstr ""
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
-msgstr "kan ikke gj�re dette i batchmodus\n"
+msgstr ""
- #: g10/card-util.c:108
-#, fuzzy
++#: g10/card-util.c:107
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:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
msgid "Reset Code not or not anymore available\n"
msgstr ""
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 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
msgid "[not set]"
-msgstr "[ikke satt]"
+msgstr ""
+#: g10/card-util.c:533
msgid "male"
-msgstr "mann"
+msgstr ""
+#: g10/card-util.c:534
msgid "female"
-msgstr "dame"
+msgstr ""
+#: g10/card-util.c:534
msgid "unspecified"
-msgstr "uspesifisert"
+msgstr ""
+#: g10/card-util.c:561
msgid "not forced"
-msgstr "ikke tvunget"
+msgstr ""
+#: g10/card-util.c:561
msgid "forced"
-msgstr "tvunget"
+msgstr ""
+#: g10/card-util.c:636
msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
+msgstr ""
+#: g10/card-util.c:638
msgid "Error: The \"<\" character may not be used.\n"
-msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
+msgstr ""
+#: g10/card-util.c:640
msgid "Error: Double spaces are not allowed.\n"
-msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
+msgstr ""
+#: g10/card-util.c:657
msgid "Cardholder's surname: "
-msgstr "Kortholders etternavn: "
+msgstr ""
+#: g10/card-util.c:659
msgid "Cardholder's given name: "
-msgstr "Kortholders fornavn: "
+msgstr ""
+#: g10/card-util.c:677
#, 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:698
msgid "URL to retrieve public key: "
-msgstr "URL for � hente offentlig n�kkel: "
+msgstr ""
+#: g10/card-util.c:706
#, 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:799 tools/no-libgcrypt.c:30
- #, c-format
- msgid "error allocating enough memory: %s\n"
- msgstr ""
-
- #: g10/card-util.c:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
-#, fuzzy, c-format
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: 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:871
msgid "Login data (account name): "
-msgstr "Logindata (kontonavn): "
+msgstr ""
+#: g10/card-util.c:881
#, 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:917
msgid "Private DO data: "
-msgstr "Privat DO-data: "
+msgstr ""
+#: g10/card-util.c:927
#, 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:1010
msgid "Language preferences: "
-msgstr "Spr�kpreferanser:"
+msgstr ""
+#: g10/card-util.c:1018
msgid "Error: invalid length of preference string.\n"
-msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
+msgstr ""
+#: g10/card-util.c:1027
msgid "Error: invalid characters in preference string.\n"
-msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
+msgstr ""
+#: g10/card-util.c:1049
msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
+msgstr ""
+#: g10/card-util.c:1063
msgid "Error: invalid response.\n"
-msgstr "Feil: ugyldig respons.\n"
+msgstr ""
+#: g10/card-util.c:1085
msgid "CA fingerprint: "
-msgstr "CA-fingeravtrykk: "
+msgstr ""
+#: g10/card-util.c:1108
msgid "Error: invalid formatted fingerprint.\n"
-msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+msgstr ""
+#: g10/card-util.c:1158
#, c-format
msgid "key operation not possible: %s\n"
-msgstr "n�kkeloperasjonen er umulig: %s\n"
+msgstr ""
+#: g10/card-util.c:1159
msgid "not an OpenPGP card"
-msgstr "ikke et OpenPGP-kort"
+msgstr ""
+#: g10/card-util.c:1172
#, 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:1259
msgid "Replace existing key? (y/N) "
-msgstr "Erstatte eksisterende n�kkel? (j/N) "
+msgstr ""
+#: g10/card-util.c:1276
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 ""
-#, fuzzy, c-format
+#: g10/card-util.c:1301
+#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
-msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+msgstr ""
-#, fuzzy, c-format
+#: g10/card-util.c:1303
+#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
-msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+msgstr ""
-#, fuzzy, c-format
+#: g10/card-util.c:1304
+#, 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:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: 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:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1718,115 -1441,94 +1736,115 @@@ msgid "
" 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:1458
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:1460 g10/card-util.c:1571
msgid " (1) Signature key\n"
-msgstr " (1) Signaturn�kkel\n"
+msgstr ""
+#: g10/card-util.c:1461 g10/card-util.c:1573
msgid " (2) Encryption key\n"
-msgstr " (2) Krypteringsn�kkel\n"
+msgstr ""
+#: g10/card-util.c:1462 g10/card-util.c:1575
msgid " (3) Authentication key\n"
-msgstr " (3) Autentiseringsn�kkel\n"
+msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
-msgstr "Ugyldig valg.\n"
+msgstr ""
+#: g10/card-util.c:1568
msgid "Please select where to store the key:\n"
-msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
+msgstr ""
-#, fuzzy, c-format
+#: g10/card-util.c:1614
+#, c-format
msgid "KEYTOCARD failed: %s\n"
-msgstr "oppdatering mislyktes: %s\n"
+msgstr ""
-#, fuzzy
-#| msgid "This command is not allowed while in %s mode.\n"
+#: g10/card-util.c:1710
msgid "This command is not supported by this card\n"
-msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
+msgstr ""
-#, fuzzy
+#: g10/card-util.c:1715
msgid "Note: This command destroys all keys stored on the card!\n"
-msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
+msgstr ""
-#, fuzzy
-#| msgid "Sign it? (y/N) "
+#: g10/card-util.c:1718
msgid "Continue? (y/N) "
-msgstr "Signere den? (j/N) "
+msgstr ""
+#: g10/card-util.c:1723
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
-msgstr "avslutte denne menyen"
+msgstr ""
+#: g10/card-util.c:1811
msgid "show admin commands"
-msgstr "vise admin-kommandoer"
+msgstr ""
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
-msgstr "vise denne hjelpen"
+msgstr ""
+#: g10/card-util.c:1814
msgid "list all available data"
-msgstr "vis alle tilgjengelige data"
+msgstr ""
+#: g10/card-util.c:1817
msgid "change card holder's name"
-msgstr "endre kortholders navn"
+msgstr ""
+#: g10/card-util.c:1818
msgid "change URL to retrieve key"
-msgstr "endre URL for � hente n�kkel"
+msgstr ""
+#: g10/card-util.c:1819
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:1820
msgid "change the login name"
-msgstr "endre loginnavnet"
+msgstr ""
+#: g10/card-util.c:1821
msgid "change the language preferences"
-msgstr "endre spr�kpreferansene"
+msgstr ""
+#: g10/card-util.c:1822
msgid "change card holder's sex"
-msgstr "endre kortholders kj�nn"
+msgstr ""
+#: g10/card-util.c:1823
msgid "change a CA fingerprint"
-msgstr "vise et CA-fingeravtrykk"
+msgstr ""
+#: g10/card-util.c:1824
msgid "toggle the signature force PIN flag"
-msgstr "veksle tving-signatur-PIN-flagget"
+msgstr ""
+#: g10/card-util.c:1825
msgid "generate new keys"
-msgstr "generere nye n�kler"
+msgstr ""
+#: g10/card-util.c:1826
msgid "menu to change or unblock the PIN"
-msgstr "meny for � endre eller fjerne blokkering av PIN"
+msgstr ""
+#: g10/card-util.c:1827
msgid "verify the PIN and list all data"
-msgstr "bekrefte PIN og vise alle data"
+msgstr ""
+#: g10/card-util.c:1828
msgid "unblock the PIN using a Reset Code"
msgstr ""
@@@ -1838,537 -1538,458 +1856,537 @@@ msgstr "
msgid "gpg/card> "
msgstr ""
+#: g10/card-util.c:1992
msgid "Admin-only command\n"
-msgstr "Admin-reservert kommando\n"
+msgstr ""
+#: g10/card-util.c:2023
msgid "Admin commands are allowed\n"
-msgstr "Admin-kommandoer er tillatt\n"
+msgstr ""
+#: g10/card-util.c:2025
msgid "Admin commands are not allowed\n"
-msgstr "Admin-kommandoer er ikke tillatt\n"
+msgstr ""
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
-msgstr "Ugyldig kommando (pr�v �help�)\n"
+msgstr ""
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
-#, fuzzy, c-format
-#| msgid "can't open `%s'\n"
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
+#, c-format
msgid "can't open '%s'\n"
-msgstr "kan ikke �pne �%s�\n"
+msgstr ""
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
-msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
+msgstr ""
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
-msgstr "feil ved lesing av n�kkelblokk: %s\n"
+msgstr ""
- #: g10/delkey.c:119 g10/getkey.c:567
-#, fuzzy, c-format
-#| msgid "key \"%s\" not found: %s\n"
++#: g10/delkey.c:118 g10/getkey.c:566
+#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
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:136
++#: g10/delkey.c:135
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:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
-msgstr "Slette denne n�kkelen fra n�kkelknippet? (j/N)"
+msgstr ""
- #: g10/delkey.c:159
++#: g10/delkey.c:158
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:196
-#, fuzzy, c-format
++#: g10/delkey.c:195
+#, c-format
msgid "deleting secret %s failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: g10/delkey.c:198
-#, fuzzy
-#| msgid "bad key"
++#: g10/delkey.c:197
msgid "key"
-msgstr "ugyldig n�kkel"
+msgstr ""
- #: g10/delkey.c:198
-#, fuzzy
-#| msgid "Pubkey: "
++#: g10/delkey.c:197
msgid "subkey"
-msgstr "Offentlig n�kkel: "
+msgstr ""
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
-msgstr "nullstilt informasjon om eiertillit\n"
+msgstr ""
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 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
++#: g10/encrypt.c:240
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
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
-msgstr "bruker cipher %s\n"
+msgstr ""
- #: g10/encrypt.c:257 g10/encrypt.c:618
-#, fuzzy, c-format
-#| msgid "`%s' already compressed\n"
++#: g10/encrypt.c:264 g10/encrypt.c:625
+#, c-format
msgid "'%s' already compressed\n"
-msgstr "�%s� er allerede komprimert\n"
+msgstr ""
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
-#, fuzzy, c-format
-#| msgid "WARNING: `%s' is an empty file\n"
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
+#, c-format
msgid "WARNING: '%s' is an empty file\n"
-msgstr "ADVARSEL: �%s� er en tom fil\n"
+msgstr ""
- #: g10/encrypt.c:551
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
++#: g10/encrypt.c:558
+#, c-format
msgid "reading from '%s'\n"
-msgstr "leser fra �%s�\n"
+msgstr ""
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
-"ADVARSEL: p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens "
-"preferanser\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr ""
-"ADVARSEL: tvang av kompresjonsalgoritme %s (%d) bryter med mottakerens "
-"preferanser\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, 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:882 g10/pkclist.c:985 g10/pkclist.c:1036
++#: g10/encrypt.c:904
#, c-format
- msgid "you may not use %s while in %s mode\n"
+ msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s kryptert for: \"%s\"\n"
+msgstr ""
- #: g10/encrypt.c:910
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
#, c-format
- msgid "%s/%s encrypted for: \"%s\"\n"
+ msgid "you may not use %s while in %s mode\n"
-msgstr "du kan ikke bruke %s i %s modus\n"
+msgstr ""
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
-msgstr "%s krypterte data\n"
+msgstr ""
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, 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
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
-"ADVARSEL: meldingen er kryptert med en svak n�kkel for den symmetriske "
-"cipher.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
-msgstr "problem ved h�ndtering av kryptert pakke\n"
+msgstr ""
+#: g10/exec.c:60
msgid "no remote program execution supported\n"
-msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
+msgstr ""
+#: g10/exec.c:319
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:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
-msgstr "eksportere signaturer som er markert som bare-lokale"
+msgstr ""
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr ""
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
-#, fuzzy
-#| msgid "%s: skipped: %s\n"
++#: g10/export.c:895
msgid " - skipped"
-msgstr "%s: hoppet over: %s\n"
+msgstr ""
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
-msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
+msgstr ""
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
-msgstr "ADVARSEL: ingenting eksportert\n"
+msgstr ""
- #: g10/export.c:1609 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"
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
+#, c-format
msgid "error creating '%s': %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
-msgstr "[Brukerid ikke funnet]"
+msgstr ""
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
-#, fuzzy, c-format
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
+#, c-format
msgid "(check argument of option '%s')\n"
-msgstr "ugyldige listevalg\n"
+msgstr ""
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
-#, fuzzy, c-format
++#: g10/getkey.c:533
+#, c-format
msgid "error looking up: %s\n"
-msgstr "feil med �%s�: %s\n"
+msgstr ""
- #: g10/getkey.c:624
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
++#: g10/getkey.c:623
+#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: g10/getkey.c:1417
-#, fuzzy, c-format
++#: g10/getkey.c:1421
+#, c-format
msgid "automatically retrieved '%s' via %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/getkey.c:1423
-#, fuzzy, c-format
++#: g10/getkey.c:1427
+#, c-format
msgid "error retrieving '%s' via %s: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/getkey.c:1425
-#, fuzzy
++#: g10/getkey.c:1429
msgid "No fingerprint"
-msgstr "CA-fingeravtrykk: "
+msgstr ""
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
-msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+msgstr ""
- #: g10/getkey.c:1674
-#, fuzzy, c-format
-#| msgid "unusable secret key"
++#: g10/getkey.c:1678
+#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
-msgstr "ubrukelig hemmelig n�kkel"
+msgstr ""
- #: g10/getkey.c:1682
-#, fuzzy, c-format
-#| msgid "unusable secret key"
++#: g10/getkey.c:1686
+#, c-format
msgid "using \"%s\" as default secret key for signing\n"
-msgstr "ubrukelig hemmelig n�kkel"
+msgstr ""
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
-#, fuzzy
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
-msgstr "|[fil]|lage en signatur"
+msgstr ""
-#, fuzzy
+#: g10/gpg.c:407
msgid "make a clear text signature"
-msgstr "|[fil]|lage en klartekstsignatur"
+msgstr ""
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
-msgstr "lage en adskilt signatur"
+msgstr ""
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
-msgstr "kryptere data"
+msgstr ""
+#: g10/gpg.c:411
msgid "encryption only with symmetric cipher"
-msgstr "kryptering med bare symmetrisk cipher"
+msgstr ""
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
-msgstr "dekryptere data (standard)"
+msgstr ""
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
-msgstr "bekrefte en signatur"
+msgstr ""
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
-msgstr "liste n�kler"
+msgstr ""
+#: g10/gpg.c:419
msgid "list keys and signatures"
-msgstr "liste n�kler og signaturer"
+msgstr ""
+#: g10/gpg.c:420
msgid "list and check key signatures"
-msgstr "vise og sjekke n�kkelsignaturer"
+msgstr ""
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
-msgstr "liste n�kler og fingeravtrykk"
+msgstr ""
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
-msgstr "liste hemmelige n�kler"
+msgstr ""
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
-msgstr "generere et nytt n�kkelpar"
+msgstr ""
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:426
msgid "quickly generate a new key pair"
-msgstr "generere et nytt n�kkelpar"
+msgstr ""
-#, fuzzy
-#| msgid "generate a new key pair"
+#: g10/gpg.c:428
msgid "quickly add a new user-id"
-msgstr "generere et nytt n�kkelpar"
+msgstr ""
+#: g10/gpg.c:430
msgid "full featured key pair generation"
msgstr ""
+#: g10/gpg.c:431
msgid "generate a revocation certificate"
-msgstr "generere et opphevingssertifikat"
+msgstr ""
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
-msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
+msgstr ""
+#: g10/gpg.c:435
msgid "remove keys from the secret keyring"
-msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
+msgstr ""
-#, fuzzy
-#| msgid "sign a key"
+#: g10/gpg.c:437
msgid "quickly sign a key"
-msgstr "signere en n�kkel"
+msgstr ""
-#, fuzzy
-#| msgid "sign a key locally"
+#: g10/gpg.c:439
msgid "quickly sign a key locally"
-msgstr "signere en n�kkel lokalt"
+msgstr ""
+#: g10/gpg.c:440
msgid "sign a key"
-msgstr "signere en n�kkel"
+msgstr ""
+#: g10/gpg.c:441
msgid "sign a key locally"
-msgstr "signere en n�kkel lokalt"
+msgstr ""
+#: g10/gpg.c:442
msgid "sign or edit a key"
-msgstr "signere eller redigere en n�kkel"
+msgstr ""
- #: g10/gpg.c:444 sm/gpgsm.c:228
-#, fuzzy
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
-msgstr "endre passfrasen"
+msgstr ""
+#: g10/gpg.c:446
msgid "export keys"
-msgstr "eksportere n�kler"
+msgstr ""
+#: g10/gpg.c:447
msgid "export keys to a key server"
-msgstr "eksportere n�kler til en n�kkelserver"
+msgstr ""
+#: g10/gpg.c:448
msgid "import keys from a key server"
-msgstr "importere n�kler fra en n�kkelserver"
+msgstr ""
+#: g10/gpg.c:450
msgid "search for keys on a key server"
-msgstr "s�ke etter n�kler p� en n�kkelserver"
+msgstr ""
+#: g10/gpg.c:452
msgid "update all keys from a keyserver"
-msgstr "oppdatere alle n�klene fra en n�kkelserver"
+msgstr ""
+#: g10/gpg.c:458
msgid "import/merge keys"
-msgstr "importere/flette n�kler"
+msgstr ""
+#: g10/gpg.c:461
msgid "print the card status"
-msgstr "vis kortets status"
+msgstr ""
+#: g10/gpg.c:462
msgid "change data on a card"
-msgstr "endre data p� et kort"
+msgstr ""
+#: g10/gpg.c:463
msgid "change a card's PIN"
-msgstr "endre PIN p� et kort"
+msgstr ""
+#: g10/gpg.c:475
msgid "update the trust database"
-msgstr "oppdatere tillitsdatabasen"
+msgstr ""
-#, fuzzy
+#: g10/gpg.c:484
msgid "print message digests"
-msgstr "|algo [filer]|skrive meldingsdigester"
+msgstr ""
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
-msgstr "lage ASCII-beskyttet output"
+msgstr ""
- #: g10/gpg.c:496 sm/gpgsm.c:254
-#, fuzzy
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|NAVN|kryptere for NAVN"
+msgstr ""
- #: g10/gpg.c:510 sm/gpgsm.c:290
-#, fuzzy
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "bruke denne brukeriden for signering eller dekryptering"
+msgstr ""
-#, fuzzy
+#: g10/gpg.c:515
msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
+msgstr ""
+#: g10/gpg.c:521
msgid "use canonical text mode"
-msgstr "bruk kanonisk tekstmodus"
+msgstr ""
- #: g10/gpg.c:538 sm/gpgsm.c:292
-#, fuzzy
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
-msgstr "leser valg fra �%s�\n"
+msgstr ""
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
-msgstr "ikke gj�r noen endringer"
+msgstr ""
+#: g10/gpg.c:551
msgid "prompt before overwriting"
-msgstr "sp�r f�r overskriving"
+msgstr ""
+#: g10/gpg.c:596
msgid "use strict OpenPGP behavior"
-msgstr "bruk streng OpenPGP-oppf�rsel"
+msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
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:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2379,612 -2000,543 +2397,612 @@@
" --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:985
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
++#: g10/gpg.c:988
msgid "Usage: @GPG@ [options] [files] (-h for help)"
-msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+msgstr ""
- #: g10/gpg.c:988
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
++#: g10/gpg.c:991
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:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
msgstr ""
-"\n"
-"St�ttede algoritmer:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
-msgstr "Offentlig n�kkel: "
+msgstr ""
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
-msgstr "Cipher: "
+msgstr ""
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
-msgstr "Hash: "
+msgstr ""
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
-msgstr "Kompresjon: "
+msgstr ""
- #: g10/gpg.c:1092 sm/gpgsm.c:654
-#, fuzzy, c-format
++#: g10/gpg.c:1095 sm/gpgsm.c:659
+#, c-format
msgid "usage: %s [options] %s\n"
-msgstr "bruksm�te: gpg [valg] "
+msgstr ""
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
-msgstr "motstridende kommandoer\n"
+msgstr ""
- #: g10/gpg.c:1310
-#, fuzzy, c-format
-#| msgid "no = sign found in group definition `%s'\n"
++#: g10/gpg.c:1313
+#, c-format
msgid "no = sign found in group definition '%s'\n"
-msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1507
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe ownership on homedir `%s'\n"
++#: g10/gpg.c:1510
+#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
-msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1510
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
++#: g10/gpg.c:1513
+#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
-msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1513
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe ownership on extension `%s'\n"
++#: g10/gpg.c:1516
+#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
-msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1519
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe permissions on homedir `%s'\n"
++#: g10/gpg.c:1522
+#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
-msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1522
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
++#: g10/gpg.c:1525
+#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
-msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1525
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe permissions on extension `%s'\n"
++#: g10/gpg.c:1528
+#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
-msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
+msgstr ""
- #: g10/gpg.c:1531
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
++#: g10/gpg.c:1534
+#, 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:1534
-#, fuzzy, c-format
-#| msgid ""
-#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
++#: g10/gpg.c:1537
+#, 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:1537
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
++#: g10/gpg.c:1540
+#, 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:1543
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
++#: g10/gpg.c:1546
+#, 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:1546
-#, fuzzy, c-format
-#| msgid ""
-#| "WARNING: unsafe enclosing directory permissions on configuration file `"
-#| "%s'\n"
++#: g10/gpg.c:1549
+#, 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:1549
-#, fuzzy, c-format
-#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
++#: g10/gpg.c:1552
+#, 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:1756
-#, fuzzy, c-format
-#| msgid "unknown configuration item `%s'\n"
++#: g10/gpg.c:1759
+#, c-format
msgid "unknown configuration item '%s'\n"
-msgstr "ukjent konfigurasjonspunkt �%s�\n"
+msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
-#, fuzzy
-#| msgid "show the keyring name in key listings"
++#: g10/gpg.c:1868
msgid "show key usage information during key listings"
-msgstr "vise navnet til n�kkelknippene i n�kkellister"
+msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr ""
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
-msgstr "vise navnet til n�kkelknippene i n�kkellister"
+msgstr ""
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr ""
- #: g10/gpg.c:1989
-#, fuzzy
++#: g10/gpg.c:1992
msgid "available TOFU policies:\n"
-msgstr "utkoble en n�kkel"
+msgstr ""
- #: g10/gpg.c:2000
-#, fuzzy, c-format
-#| msgid "unknown option `%s'\n"
++#: g10/gpg.c:2003
+#, c-format
msgid "unknown TOFU policy '%s'\n"
-msgstr "ukjent valg �%s�\n"
+msgstr ""
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
-#, fuzzy, c-format
++#: g10/gpg.c:2027
+#, c-format
msgid "unknown TOFU DB format '%s'\n"
-msgstr "ukjent valg �%s�\n"
+msgstr ""
- #: g10/gpg.c:2087
-#, fuzzy, c-format
-#| msgid "NOTE: old default options file `%s' ignored\n"
++#: g10/gpg.c:2090
+#, c-format
msgid "Note: old default options file '%s' ignored\n"
-msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
+msgstr ""
- #: g10/gpg.c:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
-#, fuzzy, c-format
-#| msgid "NOTE: %s is not for normal use!\n"
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
+#, c-format
msgid "Note: %s is not for normal use!\n"
-msgstr "MERK: %s er ikke for vanlig bruk!\n"
+msgstr ""
- #: g10/gpg.c:2848 g10/gpg.c:2860
-# Tenk litt p� denne du, Trond.
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid signature expiration\n"
++#: g10/gpg.c:2855 g10/gpg.c:2867
+#, c-format
msgid "'%s' is not a valid signature expiration\n"
-msgstr "�%s� er ikke en gyldig signaturutg�else\n"
+msgstr ""
- #: g10/gpg.c:2901
-#, fuzzy, c-format
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
+#, c-format
msgid "invalid pinentry mode '%s'\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
- #: g10/gpg.c:2954
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid character set\n"
++#: g10/gpg.c:2961
+#, c-format
msgid "'%s' is not a valid character set\n"
-msgstr "�%s� er ikke et gyldig tegnsett\n"
+msgstr ""
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
-msgstr "kunne ikke parse n�kkelserverens URL\n"
+msgstr ""
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
+msgstr ""
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
-msgstr "ugyldige valg for n�kkelserver\n"
+msgstr ""
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: ugyldige importvalg\n"
+msgstr ""
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
-msgstr "ugyldige importvalg\n"
+msgstr ""
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: ugyldige eksportvalg\n"
+msgstr ""
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
-msgstr "ugyldige eksportvalg\n"
+msgstr ""
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: ugyldige listevalg\n"
+msgstr ""
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
-msgstr "ugyldige listevalg\n"
+msgstr ""
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr ""
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr ""
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
msgid "show only the primary user ID in signature verification"
msgstr ""
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: ugyldige valg for bekreftelse\n"
+msgstr ""
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
-msgstr "ugyldige valg for bekreftelse\n"
+msgstr ""
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
-msgstr "kunne ikke sette exec-path til %s\n"
+msgstr ""
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
+msgstr ""
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
-msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
+msgstr ""
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
-msgstr "ADVARSEL: %s overstyrere %s\n"
+msgstr ""
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr "%s er ikke tillatt sammen med %s!\n"
+msgstr ""
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr "%s er ikke fornuftig med %s!\n"
+msgstr ""
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr ""
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
-msgstr "valgt krypteringsalgoritme er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
-msgstr "valg digestalgoritme er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
-msgstr "valgt kompresjonsalgoritme er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
-msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
-msgstr "completes-needed m� v�re st�rre enn 0\n"
+msgstr ""
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
-msgstr "marginals-neede m� v�re st�rre enn 1\n"
+msgstr ""
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
-#, fuzzy
-#| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
++#: g10/gpg.c:3527
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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
-msgstr "ugyldig standard preferanser\n"
+msgstr ""
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
-msgstr "ugyldig personlig cipherpreferanser\n"
+msgstr ""
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
-msgstr "ugyldig personlig digestpreferanser\n"
+msgstr ""
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
-msgstr "ugyldig personlig kompresjonspreferanser\n"
+msgstr ""
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
-msgstr "%s virker ikke enn� med %s\n"
+msgstr ""
- #: g10/gpg.c:3626
-#, fuzzy, c-format
-#| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
++#: g10/gpg.c:3633
+#, 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:3631
-#, fuzzy, c-format
-#| msgid "you may not use digest algorithm `%s' while in %s mode\n"
++#: g10/gpg.c:3638
+#, 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:3636
-#, fuzzy, c-format
-#| msgid "you may not use compression algorithm `%s' while in %s mode\n"
++#: g10/gpg.c:3643
+#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
-msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
+msgstr ""
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
-msgstr "--store [filnavn]"
+msgstr ""
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
-msgstr "--symmetric [filnavn]"
+msgstr ""
- #: g10/gpg.c:3810
-#, fuzzy, c-format
-#| msgid "symmetric encryption of `%s' failed: %s\n"
++#: g10/gpg.c:3817
+#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
-msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
-msgstr "--encrypt [filnavn]"
+msgstr ""
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
-msgstr "--symmetric --encrypt [filnavn]"
+msgstr ""
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
-msgstr "--sign [filnavn]"
+msgstr ""
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
-msgstr "--sign --encrypt [filnavn]"
+msgstr ""
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--symmetric --sign --encrypt [filnavn]"
+msgstr ""
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
-msgstr "--sign --symmetric [filnavn]"
+msgstr ""
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
-msgstr "--clearsign [filnavn]"
+msgstr ""
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
-msgstr "--decrypt [filnavn]"
+msgstr ""
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
-msgstr "--sign-key brukerid"
+msgstr ""
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
-msgstr "--lsign-key brukerid"
+msgstr ""
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
-msgstr "--edit-key brukerid [kommandoer]"
+msgstr ""
- #: g10/gpg.c:4036
-#, fuzzy
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
-msgstr "--sign-key brukerid"
+msgstr ""
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
-msgstr "sending til n�kkelserver mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
-msgstr "mottak fra n�kkelserver mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
-msgstr "n�kkeleksport mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4198
-#, fuzzy, c-format
-#| msgid "key export failed: %s\n"
++#: g10/gpg.c:4205
+#, c-format
msgid "export as ssh key failed: %s\n"
-msgstr "n�kkeleksport mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
-msgstr "s�k p� n�kkelserver mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
-msgstr "refresh p� n�kkelserver mislyktes: %s\n"
+msgstr ""
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
-msgstr "dearmoring failed: %s\n"
+msgstr ""
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
-msgstr "enarmoring failed: %s\n"
+msgstr ""
- #: g10/gpg.c:4393
-#, fuzzy, c-format
-#| msgid "invalid hash algorithm `%s'\n"
++#: g10/gpg.c:4400
+#, c-format
msgid "invalid hash algorithm '%s'\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
- #: g10/gpg.c:4537
-#, fuzzy, c-format
++#: g10/gpg.c:4544
+#, 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:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
-msgstr "[filnavn]"
+msgstr ""
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
-msgstr "Sett i gang og tast inn meldingen din ...\n"
+msgstr ""
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
-msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
-msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
+msgstr ""
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
-msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
+msgstr ""
-#, 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:77
msgid "make timestamp conflicts only a warning"
-msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
+msgstr ""
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
-msgstr "|FD|skrive statusinfo til denne FD"
+msgstr ""
+#: g10/gpgv.c:119
msgid "Usage: gpgv [options] [files] (-h for help)"
-msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
+msgstr ""
-#, fuzzy
+#: g10/gpgv.c:121
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -2999,321 -2551,263 +3017,321 @@@ msgstr "
msgid "No help available for '%s'"
msgstr ""
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
-#, fuzzy
-#| msgid "do not update the trustdb after import"
++#: g10/import.c:110
msgid "do not clear the ownertrust values during import"
-msgstr "ikke oppdat�r tillitsdatabasen etter import"
+msgstr ""
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
-msgstr "ikke oppdat�r tillitsdatabasen etter import"
+msgstr ""
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr ""
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
-msgstr "hopper over blokk av typen %d\n"
+msgstr ""
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
-msgstr "%lu n�kler behandlet hittil\n"
+msgstr ""
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
-msgstr "Totalt antall behandlet: %lu\n"
+msgstr ""
- #: g10/import.c:434
-#, fuzzy, c-format
-#| msgid " skipped new keys: %lu\n"
++#: g10/import.c:433
+#, c-format
msgid " skipped PGP-2 keys: %lu\n"
-msgstr "nye n�kler som ble hoppet over: %lu\n"
+msgstr ""
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
-msgstr "nye n�kler som ble hoppet over: %lu\n"
+msgstr ""
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
-msgstr " uten brukerider: %lu\n"
+msgstr ""
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
-msgstr " importert: %lu"
+msgstr ""
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
-msgstr " uendret: %lu\n"
+msgstr ""
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
-msgstr " nye brukerider: %lu\n"
+msgstr ""
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
-msgstr " nye undern�kler: %lu\n"
+msgstr ""
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
-msgstr " nye signaturer: %lu\n"
+msgstr ""
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
-msgstr " nye n�kkelopphevinger: %lu\n"
+msgstr ""
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
-msgstr " leste hemmelige n�kler: %lu\n"
+msgstr ""
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
-msgstr " importerte hemmelige n�kler: %lu\n"
+msgstr ""
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
-msgstr " uforandrede hemmelige n�kler: %lu\n"
+msgstr ""
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
-msgstr " ikke importert: %lu\n"
+msgstr ""
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
-msgstr " oppryddete signaturer: %lu\n"
+msgstr ""
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
-msgstr " oppryddete brukerider: %lu\n"
+msgstr ""
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
-msgstr " �%s� preferanse for digestalgoritme %s\n"
+msgstr ""
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
-msgstr "n�kkel %s: ingen brukerid\n"
+msgstr ""
- #: g10/import.c:989
-#, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
++#: g10/import.c:988
+#, c-format
msgid "key %s: %s\n"
-msgstr "hoppet over �%s�: %s\n"
+msgstr ""
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "n�kkel %s: PKS-undern�kkel reparert\n"
+msgstr ""
- #: g10/import.c:1036
++#: g10/import.c:1035
#, 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:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
-msgstr "n�kkel %s: ingen gyldig brukerid\n"
+msgstr ""
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
-msgstr "dette kan skyldes en manglende selvsignatur\n"
+msgstr ""
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, 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:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
-msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
+msgstr ""
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
-msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
+msgstr ""
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
-#, fuzzy, c-format
-#| msgid "writing to `%s'\n"
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:815
++#: g10/sign.c:1117
+#, c-format
msgid "writing to '%s'\n"
-msgstr "skriver til �%s�\n"
+msgstr ""
- #: g10/import.c:1091 g10/import.c:1192 g10/import.c:1922
-#, fuzzy, c-format
-#| msgid "error writing keyring `%s': %s\n"
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
+#, c-format
msgid "error writing keyring '%s': %s\n"
-msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: g10/import.c:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
-msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
+msgstr ""
- #: g10/import.c:1135
++#: g10/import.c:1134
#, 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:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
+msgstr ""
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "n�kkel %s: �%s� %d nye brukerider\n"
+msgstr ""
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "n�kkel %s: �%s� 1 ny signatur\n"
+msgstr ""
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr ""
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
+msgstr ""
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
+msgstr ""
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
-msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr ""
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
-msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr ""
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
-msgstr "n�kkel %s: �%s� %d nye brukerider\n"
+msgstr ""
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
-msgstr "n�kkel %s: �%s� %d nye brukerider\n"
+msgstr ""
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
-msgstr "n�kkel %s: �%s� ikke endret\n"
+msgstr ""
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
-msgstr "n�kkel %s: hemmelig n�kkel importert\n"
+msgstr ""
- #: g10/import.c:1571
-#, fuzzy, c-format
-#| msgid "key %s: secret key imported\n"
++#: g10/import.c:1570
+#, c-format
msgid "key %s: secret key already exists\n"
-msgstr "n�kkel %s: hemmelig n�kkel importert\n"
+msgstr ""
- #: g10/import.c:1579
-#, fuzzy, c-format
++#: g10/import.c:1578
+#, c-format
msgid "key %s: error sending to agent: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/import.c:1684
-#, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
++#: g10/import.c:1683
+#, c-format
msgid "secret key %s: %s\n"
-msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+msgstr ""
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
-msgstr "import av hemmelig n�kkel er ikke tillatt\n"
+msgstr ""
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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 ""
#. TRANSLATORS: For smartcard, each private key on
#. host has a reference (stub) to a smartcard and
@@@ -3325,599 -2819,518 +3343,622 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
+msgstr ""
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
+msgstr ""
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
-msgstr "n�kkel %s: ingen brukerid for signatur\n"
+msgstr ""
- #: g10/import.c:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
-msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
+msgstr ""
- #: g10/import.c:2044
-#, fuzzy, c-format
++#: g10/import.c:2043
+#, c-format
msgid "key %s: invalid direct key signature\n"
-msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
+msgstr ""
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
-msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
+msgstr ""
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
-msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
+msgstr ""
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
-msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
+msgstr ""
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
-msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
+msgstr ""
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
+msgstr ""
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
-msgstr "n�kkel %s: hoppet over undern�kkel\n"
+msgstr ""
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
+msgstr ""
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
-msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
+msgstr ""
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
-#, fuzzy, c-format
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
+#, c-format
msgid "error creating keybox '%s': %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: g10/keydb.c:406 g10/keydb.c:433
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
++#: g10/keydb.c:405 g10/keydb.c:432
+#, c-format
msgid "error creating keyring '%s': %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: g10/keydb.c:442 sm/keydb.c:217
-#, fuzzy, c-format
++#: g10/keydb.c:441 sm/keydb.c:229
+#, c-format
msgid "keybox '%s' created\n"
-msgstr "n�kkelknippet �%s� ble opprettet\n"
+msgstr ""
- #: g10/keydb.c:444
-#, fuzzy, c-format
-#| msgid "keyring `%s' created\n"
++#: g10/keydb.c:443
+#, c-format
msgid "keyring '%s' created\n"
-msgstr "n�kkelknippet �%s� ble opprettet\n"
+msgstr ""
- #: g10/keydb.c:823
-#, fuzzy, c-format
-#| msgid "keyblock resource `%s': %s\n"
++#: g10/keydb.c:822
+#, c-format
msgid "keyblock resource '%s': %s\n"
-msgstr "n�kkelblokkressurs �%s�: %s\n"
+msgstr ""
- #: g10/keydb.c:908
-#, fuzzy, c-format
++#: g10/keydb.c:907
+#, c-format
msgid "error opening key DB: %s\n"
-msgstr "feil med �%s�: %s\n"
+msgstr ""
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr ""
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
-msgstr "[oppheving]"
+msgstr ""
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
-msgstr "[selvsignatur]"
+msgstr ""
- #: g10/keyedit.c:387 g10/keylist.c:472
-#, fuzzy, c-format
-#| msgid "key %s: unsupported public key algorithm\n"
++#: g10/keyedit.c:611
+#, c-format
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
++msgstr ""
+
-#, fuzzy, c-format
-#| msgid "card does not support digest algorithm %s\n"
++#: g10/keyedit.c:620
++#, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-msgstr "kortet st�tter ikke digestalgoritme %s\n"
++msgstr ""
+
-#, fuzzy
++#: g10/keyedit.c:782
+ msgid " (reordered signatures follow)"
-msgstr "God signatur fra �%s�"
++msgstr ""
+
-#, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
++#: g10/keyedit.c:895
++#, c-format
+ msgid "key %s:\n"
-msgstr "hoppet over �%s�: %s\n"
++msgstr ""
+
-#, fuzzy, c-format
++#: g10/keyedit.c:898
++#, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
-msgstr[0] "n�kkel: %s: �%s� %d nye signaturer\n"
-msgstr[1] "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:391 g10/keylist.c:476
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
++#: g10/keyedit.c:901 g10/keylist.c:475
+#, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "1 signatur ble ikke sjekket p� grunn av en manglende n�kkel\n"
-msgstr[1] "1 signatur ble ikke sjekket p� grunn av en manglende n�kkel\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:396 g10/keylist.c:481
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
++#: g10/keyedit.c:905 g10/keylist.c:471
+#, c-format
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
-msgstr[0] "%d ubrukelige signaturer\n"
-msgstr[1] "%d ubrukelige signaturer\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:401
-#, fuzzy, c-format
++#: g10/keyedit.c:909
+#, c-format
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
-msgstr[0] "God signatur fra �%s�"
-msgstr[1] "God signatur fra �%s�"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
+
++#: g10/keyedit.c:974 g10/pkclist.c:275
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:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
-msgstr " %d = Jeg stoler marginalt\n"
+msgstr ""
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
-msgstr " %d = Jeg stoler fullt\n"
+msgstr ""
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
-msgstr "Brukerid �%s� er opphevet."
+msgstr ""
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
-msgstr " Kunne ikke signere.\n"
+msgstr ""
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
-msgstr "Brukerid �%s� er utg�tt."
+msgstr ""
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
-msgstr "Brukeriden �%s� er ikke selvsignert."
+msgstr ""
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
-msgstr "Brukeriden �%s� er signerbar."
+msgstr ""
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
-msgstr "Signere den? (j/N) "
+msgstr ""
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, 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:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, 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:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, 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:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, 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:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "Vil du likevel signere den igjen? (j/N) "
+msgstr ""
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
-msgstr "Ingenting � signere med n�kkelen %s\n"
+msgstr ""
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
-msgstr "Denne n�kkelen er utg�tt!"
+msgstr ""
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, 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:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
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:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
-msgstr " (0) Jeg vil ikke svare.%s\n"
+msgstr ""
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, 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:953
++#: g10/keyedit.c:1466
#, 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:956
++#: g10/keyedit.c:1469
#, 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:963
-#, fuzzy
-#| msgid "Your selection? (enter `?' for more information): "
++#: g10/keyedit.c:1476
msgid "Your selection? (enter '?' for more information): "
-msgstr "Ditt valg? (angi �?� for mer informasjon): "
+msgstr ""
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, 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:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
-msgstr "Dette vil v�re en selvsignatur.\n"
+msgstr ""
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
-msgstr "Signaturen vil bli markert som ikke-eksporterbar.\n"
+msgstr ""
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
-msgstr "Signaturen vil bli markert som ikke-opphevbar.\n"
+msgstr ""
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
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:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
-msgstr "Jeg har sjekket denne n�kkelen p� vanlig m�te.\n"
+msgstr ""
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
-msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
+msgstr ""
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
-msgstr "Virkelig signere? (j/N) "
+msgstr ""
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
-msgstr "signering mislyktes: %s\n"
+msgstr ""
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
-#, fuzzy, c-format
-#| msgid "error creating passphrase: %s\n"
++#: g10/keyedit.c:1736
+#, c-format
msgid "key %s: error changing passphrase: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: g10/keyedit.c:1270
- msgid "moving a key signature to the correct place\n"
- msgstr ""
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
-msgstr "lagre og avslutte"
+msgstr ""
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
-msgstr "vise n�kkelens fingeravtrykk"
+msgstr ""
- #: g10/keyedit.c:1389
-#, fuzzy
-#| msgid "show this help"
++#: g10/keyedit.c:1854
msgid "show the keygrip"
-msgstr "vise denne hjelpen"
+msgstr ""
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
-msgstr "liste n�kler og brukerider"
+msgstr ""
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
-msgstr "velger brukerid N"
+msgstr ""
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
-msgstr "velger brukerid N"
+msgstr ""
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
-msgstr "sjekke signaturer"
+msgstr ""
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
-msgstr "signerere utvalgte brukerider lokalt"
+msgstr ""
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
-msgstr "signere utvalgte brukerider med en tillitssignatur"
+msgstr ""
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
-msgstr "legge til en brukerid"
+msgstr ""
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
-msgstr "legge til en fotoid"
+msgstr ""
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
-msgstr "slette utvalgte brukerider"
+msgstr ""
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
-msgstr "legge til en undern�kkel"
+msgstr ""
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
-msgstr "slette utvalgte undern�kler"
+msgstr ""
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
-msgstr "legge til en opphevingsn�kkel"
+msgstr ""
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
-msgstr "slette signaturene fra de utvalgte brukeridene"
+msgstr ""
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
msgid "change the expiration date for the key or selected subkeys"
msgstr ""
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
-msgstr "markere den valgte brukeriden som den prim�re"
+msgstr ""
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
-msgstr "liste preferanser (ekspert)"
+msgstr ""
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
-msgstr "liste preferanser (fyldig)"
+msgstr ""
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
-msgstr "sette preferanseliste for de valgte brukeridene"
+msgstr ""
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
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:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
-msgstr "sette en notasjon for de valgte brukeridene"
+msgstr ""
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
-msgstr "endre passfrasen"
+msgstr ""
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
-msgstr "endre eiertilliten"
+msgstr ""
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
-msgstr "oppheve signaturene p� de valgte brukeridene"
+msgstr ""
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
-msgstr "oppheve utvalgte brukerider"
+msgstr ""
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
-msgstr "oppheve n�kkel eller utvalgte undern�kler"
+msgstr ""
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
-msgstr "innkoble en n�kkel"
+msgstr ""
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
-msgstr "utkoble en n�kkel"
+msgstr ""
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
-msgstr "vise utvalgte fotoider"
+msgstr ""
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
-msgstr "Hemmelig n�kkel er tilgjengelig\n"
+msgstr ""
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
-msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
+msgstr ""
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -3925,606 -3338,498 +3966,611 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
-msgstr "N�kkelen er opphevet."
+msgstr ""
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
-msgstr "Virkelig signerere alle brukerider? (j/N) "
+msgstr ""
- #: g10/keyedit.c:1780
-#, fuzzy
-#| msgid "Really sign all user IDs? (y/N) "
++#: g10/keyedit.c:2246
msgid "Really sign all text user IDs? (y/N) "
-msgstr "Virkelig signerere alle brukerider? (j/N) "
+msgstr ""
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
-msgstr "Tips: Velg brukeriden som skal signeres\n"
+msgstr ""
- #: g10/keyedit.c:1799
-#, fuzzy, c-format
-#| msgid "Unknown signature type `%s'\n"
++#: g10/keyedit.c:2265
+#, c-format
msgid "Unknown signature type '%s'\n"
-msgstr "Ukjent signaturtype �%s�\n"
+msgstr ""
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
-msgstr "Du m� velge minst en brukerid.\n"
+msgstr ""
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
-msgstr "Du kan ikke slette den siste brukeriden!\n"
+msgstr ""
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
-msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
+msgstr ""
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
-msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
+msgstr ""
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
-msgstr "Du m� velge minst en n�kkel.\n"
+msgstr ""
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
-#, fuzzy, c-format
-#| msgid "Can't open `%s': %s\n"
++#: g10/keyedit.c:2437
+#, c-format
msgid "Can't open '%s': %s\n"
-msgstr "Kan ikke �pne �%s�: %s\n"
+msgstr ""
- #: g10/keyedit.c:1988
-#, fuzzy, c-format
-#| msgid "Error reading backup key from `%s': %s\n"
++#: g10/keyedit.c:2454
+#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
-msgstr "Du m� velge minst en n�kkel.\n"
+msgstr ""
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
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:2031
++#: g10/keyedit.c:2497
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:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
-msgstr "Virkelig oppheve denne brukeriden? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
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:2099
++#: g10/keyedit.c:2565
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:2101
++#: g10/keyedit.c:2567
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:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
-msgstr "sette preferanseliste til:\n"
+msgstr ""
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
-msgstr "Virkelig oppdatere preferansene? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
-msgstr "Lagre endringene? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
-msgstr "Avslutte uten � lagre? (j/N) "
+msgstr ""
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
-msgstr "oppdatering mislyktes: %s\n"
+msgstr ""
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
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:2494
-#, fuzzy, c-format
-#| msgid "invalid fingerprint"
++#: g10/keyedit.c:2968
+#, c-format
msgid "\"%s\" is not a fingerprint\n"
-msgstr "ugyldig fingeravtrykk"
+msgstr ""
- #: g10/keyedit.c:2526
-#, fuzzy, c-format
++#: g10/keyedit.c:3000
+#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
-msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
+msgstr ""
- #: g10/keyedit.c:2580
-#, fuzzy, c-format
-#| msgid "invalid value\n"
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
++#, c-format
+ msgid "Invalid user ID '%s': %s\n"
-msgstr "ugyldig verdi\n"
++msgstr ""
+
-#, fuzzy
-#| msgid "No such user ID.\n"
++#: g10/keyedit.c:3099
msgid "No matching user IDs."
-msgstr "Det finnes ingen slik brukerid.\n"
+msgstr ""
- #: g10/keyedit.c:2580
-#, fuzzy
-#| msgid "Nothing to sign with key %s\n"
++#: g10/keyedit.c:3099
msgid "Nothing to sign.\n"
-msgstr "Ingenting � signere med n�kkelen %s\n"
+msgstr ""
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
-msgstr "Digest: "
+msgstr ""
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
-msgstr "S�rtrekk: "
+msgstr ""
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
-msgstr "Notasjoner: "
+msgstr ""
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
-#, fuzzy, c-format
++#: g10/keyedit.c:3620
+#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
-msgstr "(sensitiv)"
+msgstr ""
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
-msgstr "opprettet: %s"
+msgstr ""
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
-msgstr "opphevet: %s"
+msgstr ""
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
-msgstr "utgikk: %s"
+msgstr ""
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
-msgstr "utg�r: %s"
+msgstr ""
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
-msgstr "bruksm�te: %s"
+msgstr ""
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
-msgstr "tillit: %s"
+msgstr ""
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
-msgstr "gyldighet: %s"
+msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
-msgstr "Denne n�kkelen har blitt utkoblet"
+msgstr ""
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
-msgstr "opphevet"
+msgstr ""
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
-msgstr "utg�tt"
+msgstr ""
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
msgid "You may want to change its expiration date too.\n"
msgstr ""
- #: g10/keyedit.c:3565
++#: g10/keyedit.c:4084
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:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
- #: g10/keyedit.c:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
-msgstr "Slette denne gode signaturen? (j/N/a)"
+msgstr ""
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr ""
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr ""
- #: g10/keyedit.c:3727
-#, fuzzy, c-format
-#| msgid "Deleted %d signature.\n"
++#: g10/keyedit.c:4246
+#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
-msgstr[0] "Slettet %d signatur.\n"
-msgstr[1] "Slettet %d signatur.\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
-msgstr "Ingen ble slettet.\n"
+msgstr ""
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
-msgstr "ugyldig"
+msgstr ""
- #: g10/keyedit.c:3768
-#, fuzzy, c-format
++#: g10/keyedit.c:4287
+#, c-format
msgid "User ID \"%s\" compacted: %s\n"
-msgstr "brukerid �%s�: allerede renset\n"
+msgstr ""
- #: g10/keyedit.c:3774
-#, fuzzy, c-format
++#: g10/keyedit.c:4293
+#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
-msgstr[0] "n�kkel: %s: �%s� %d nye signaturer\n"
-msgstr[1] "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:3782
-#, fuzzy, c-format
++#: g10/keyedit.c:4301
+#, c-format
msgid "User ID \"%s\": already minimized\n"
-msgstr "brukerid �%s�: allerede renset\n"
+msgstr ""
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
-msgstr "brukerid �%s�: allerede renset\n"
+msgstr ""
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
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:3863
++#: g10/keyedit.c:4382
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
- #: g10/keyedit.c:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr ""
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3920
++#: g10/keyedit.c:4439
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3942
++#: g10/keyedit.c:4461
msgid "this key has already been designated as a revoker\n"
msgstr ""
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
- #: g10/keyedit.c:3967
++#: g10/keyedit.c:4485
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:4018
-#, fuzzy
-#| msgid ""
-#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
++#: g10/keyedit.c:4536
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:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr ""
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr ""
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
- #: g10/keyedit.c:4144
-#, fuzzy, c-format
++#: g10/keyedit.c:4768
+#, c-format
msgid "signing subkey %s is already cross-certified\n"
-msgstr "Undern�kkel %s er allerede opphevet.\n"
+msgstr ""
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr ""
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
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:4557
++#: g10/keyedit.c:5181
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:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr ""
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr ""
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr ""
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr ""
- #: g10/keyedit.c:4996
-#, fuzzy, c-format
-#| msgid "Nothing to sign with key %s\n"
++#: g10/keyedit.c:5620
+#, c-format
msgid "No subkey with key ID '%s'.\n"
-msgstr "Ingenting � signere med n�kkelen %s\n"
+msgstr ""
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr ""
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr ""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
- #: g10/keyedit.c:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
-msgstr " (ikke-eksporterbar)"
+msgstr ""
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
-msgstr "Denne signaturen utgikk den %s.\n"
+msgstr ""
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr ""
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr ""
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
-msgstr " (ikke-opphevbar)"
+msgstr ""
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr ""
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr ""
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr ""
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
-msgstr "ingen hemmelig n�kkel\n"
+msgstr ""
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
-msgstr "brukerid �%s� er allerede opphevet\n"
+msgstr ""
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
-msgstr "N�kkelen %s er allerede opphevet.\n"
+msgstr ""
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
-msgstr "Undern�kkel %s er allerede opphevet.\n"
+msgstr ""
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
- #: g10/keygen.c:273
-#, fuzzy, c-format
-#| msgid "preference `%s' duplicated\n"
++#: g10/keygen.c:284
+#, c-format
msgid "preference '%s' duplicated\n"
-msgstr "preferansen %s er duplisert\n"
+msgstr ""
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
-msgstr "for mange cipher-preferanser\n"
+msgstr ""
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
-msgstr "for mange digest-preferanser\n"
+msgstr ""
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
-msgstr "for mange kompresjons-preferanser\n"
+msgstr ""
- #: g10/keygen.c:425
-#, fuzzy, c-format
-#| msgid "invalid item `%s' in preference string\n"
++#: g10/keygen.c:436
+#, c-format
msgid "invalid item '%s' in preference string\n"
-msgstr "ugyldig oppf�ring �%s� i preferansestreng\n"
+msgstr ""
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
-msgstr "skriver direkte signatur\n"
+msgstr ""
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
-msgstr "skriver selvsignatur\n"
+msgstr ""
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
-msgstr "skriver n�kkelbindende signatur\n"
+msgstr ""
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
-msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
+msgstr ""
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, 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:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
-msgstr "Signere"
+msgstr ""
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
-msgstr "Bekrefte"
+msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
-msgstr "Kryptere data"
+msgstr ""
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
-msgstr "Autentisere"
+msgstr ""
-# S og s for signering
-# K og k for kryptering
-# A og a for autentisering
-# Q og q for avslutte
#. TRANSLATORS: Please use only plain ASCII characters for the
#. translation. If this is not possible use single digits. The
#. string needs to 8 bytes long. Here is a description of the
@@@ -4535,150 -3840,125 +4581,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
-msgstr "SsKkAaQq"
+msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr ""
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
-msgstr "Vennligst velg hvilken type n�kkel du vil ha:\n"
+msgstr ""
- #: g10/keygen.c:1838
-#, fuzzy, c-format
++#: g10/keygen.c:1855
+#, c-format
msgid " (%d) RSA and RSA (default)\n"
-msgstr " (%d) DSA og ElGamal (standard)\n"
+msgstr ""
- #: g10/keygen.c:1842
-#, fuzzy, c-format
++#: g10/keygen.c:1859
+#, c-format
msgid " (%d) DSA and Elgamal\n"
-msgstr " (%d) DSA og ElGamal (standard)\n"
+msgstr ""
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
-msgstr " (%d) DSA (bare signering)\n"
+msgstr ""
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
-msgstr " (%d) RSA (bare signering)\n"
+msgstr ""
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
-msgstr " (%d) ElGamal (bare kryptering)\n"
+msgstr ""
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
-msgstr " (%d) RSA (bare kryptering)\n"
+msgstr ""
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
-msgstr " (%d) DSA (sette dine egne muligheter)\n"
+msgstr ""
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
-msgstr " (%d) RSA (sette dine egne muligheter)\n"
+msgstr ""
- #: g10/keygen.c:1866
-#, fuzzy, c-format
++#: g10/keygen.c:1883
+#, c-format
msgid " (%d) ECC and ECC\n"
-msgstr " (%d) DSA og ElGamal (standard)\n"
+msgstr ""
- #: g10/keygen.c:1868
-#, fuzzy, c-format
-#| msgid " (%d) DSA (sign only)\n"
++#: g10/keygen.c:1885
+#, c-format
msgid " (%d) ECC (sign only)\n"
-msgstr " (%d) DSA (bare signering)\n"
+msgstr ""
- #: g10/keygen.c:1870
-#, fuzzy, c-format
-#| msgid " (%d) DSA (set your own capabilities)\n"
++#: g10/keygen.c:1887
+#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
-msgstr " (%d) DSA (sette dine egne muligheter)\n"
+msgstr ""
- #: g10/keygen.c:1872
-#, fuzzy, c-format
-#| msgid " (%d) RSA (encrypt only)\n"
++#: g10/keygen.c:1889
+#, c-format
msgid " (%d) ECC (encrypt only)\n"
-msgstr " (%d) RSA (bare kryptering)\n"
+msgstr ""
- #: g10/keygen.c:1876
-#, fuzzy, c-format
++#: g10/keygen.c:1893
+#, c-format
msgid " (%d) Existing key\n"
-msgstr " (2) Krypteringsn�kkel\n"
+msgstr ""
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr ""
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr ""
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
-#, fuzzy, c-format
++#: g10/keygen.c:2078
+#, c-format
msgid "What keysize do you want for the subkey? (%u) "
-msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+msgstr ""
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
-msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+msgstr ""
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
-msgstr "�nsket n�kkelst�rrelse er %u bits\n"
+msgstr ""
- #: g10/keygen.c:2096 g10/keygen.c:2110
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
++#: g10/keygen.c:2113 g10/keygen.c:2127
+#, c-format
msgid "rounded to %u bits\n"
-msgstr "rundet opp til %u bits\n"
+msgstr ""
- #: g10/keygen.c:2155
-#, fuzzy
-#| msgid "Please select what kind of key you want:\n"
++#: g10/keygen.c:2178
msgid "Please select which elliptic curve you want:\n"
-msgstr "Vennligst velg hvilken type n�kkel du vil ha:\n"
+msgstr ""
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4687,8 -3967,13 +4733,8 @@@
" <n>m = key expires in n months\n"
" <n>y = key expires in n years\n"
msgstr ""
-"Vennligst angi hvor lenge n�kkelen skal v�re gyldig.\n"
-" 0 = n�kkelen utg�r ikke\n"
-" <n> = n�kkelen utg�r om n days\n"
-" <n>w = n�kkelen utg�r om n weeks\n"
-" <n>m = n�kkelen utg�r om n months\n"
-" <n>y = n�kkelen utg�r om n years\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4697,49 -3982,47 +4743,49 @@@
" <n>m = signature expires in n months\n"
" <n>y = signature expires in n years\n"
msgstr ""
-"Vennligst angi hvor lenge signaturen skal v�re gyldig.\n"
-" 0 = signaturen utg�r ikke\n"
-" <n> = signaturen utg�r om n days\n"
-" <n>w = signaturen utg�r om n weeks\n"
-" <n>m = signaturen utg�r om n months\n"
-" <n>y = signaturen utg�r om n years\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
-msgstr "N�kkelen er gyldig for? (0) "
+msgstr ""
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
-msgstr "Signaturen er gyldig for? (%s) "
+msgstr ""
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
-msgstr "ugyldig verdi\n"
+msgstr ""
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
-msgstr "N�kkel utg�r ikke i det hele tatt\n"
+msgstr ""
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
-msgstr "Signaturen utg�r ikke i det hele tatt\n"
+msgstr ""
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
-msgstr "N�kkel utg�r den %s\n"
+msgstr ""
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
-msgstr "Signaturen utg�r den %s\n"
+msgstr ""
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-"Systemet ditt kan ikke vise datoer etter 2038.\n"
-"Likevel vil det bli h�ndtert korrekt opp til 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
-msgstr "Er dette korrekt (j/N)? "
+msgstr ""
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4750,7 -4033,6 +4796,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -4759,60 -4041,59 +4805,60 @@@
" \"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:2521
++#: g10/keygen.c:2534
msgid "Real name: "
-msgstr "Fullt navn: "
+msgstr ""
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
-msgstr "Ugyldig tegn i navn\n"
+msgstr ""
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
-msgstr "Navnet kan ikke starte med et siffer\n"
+msgstr ""
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
-msgstr "Navnet m� v�re minst 5 tegn langt\n"
+msgstr ""
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
-msgstr "Epostadresse: "
+msgstr ""
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
-msgstr "Ikke en gyldig epostadresse\n"
+msgstr ""
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
-msgstr "Kommentar: "
+msgstr ""
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
-msgstr "Ugyldig tegn i kommentar\n"
+msgstr ""
- #: g10/keygen.c:2605
-#, fuzzy, c-format
-#| msgid "You are using the `%s' character set.\n"
++#: g10/keygen.c:2618
+#, c-format
msgid "You are using the '%s' character set.\n"
-msgstr "Du bruker tegnsettet �%s�.\n"
+msgstr ""
- #: g10/keygen.c:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
" \"%s\"\n"
"\n"
msgstr ""
-"Du valgte denne brukeriden:\n"
-" �%s�\n"
-"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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
@@@ -4825,44 -4106,43 +4871,44 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
-msgstr "NnKeEeRrAa"
+msgstr ""
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
-#, fuzzy
-#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
++#: g10/keygen.c:2670
msgid "Change (N)ame, (E)mail, or (Q)uit? "
-msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
+msgstr ""
- #: g10/keygen.c:2658
-#, fuzzy
-#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
++#: g10/keygen.c:2671
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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
-msgstr "Vennligst korriger feilen f�rst\n"
+msgstr ""
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
-msgstr "N�kkelgenerering mislyktes: %s\n"
+msgstr ""
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -4870,690 -4150,597 +4916,697 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
-#, fuzzy, c-format
-#| msgid "key already exists\n"
++#: g10/keygen.c:3509
+#, c-format
msgid "A key for \"%s\" already exists\n"
-msgstr "n�kkel finnes allerede\n"
+msgstr ""
- #: g10/keygen.c:3501
-#, fuzzy
-#| msgid "Use this key anyway? (y/N) "
++#: g10/keygen.c:3514
msgid "Create anyway? (y/N) "
-msgstr "Bruke denne n�kkelen likevel? (j/N) "
+msgstr ""
- #: g10/keygen.c:3506
-#, fuzzy
-#| msgid "generating new key\n"
++#: g10/keygen.c:3519
msgid "creating anyway\n"
-msgstr "generere en ny n�kkel\n"
+msgstr ""
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
-msgstr "N�kkelgenereringen ble avbrutt.\n"
+msgstr ""
- #: g10/keygen.c:3853
-#, fuzzy, c-format
-#| msgid "can't create backup file `%s': %s\n"
++#: g10/keygen.c:3871
+#, c-format
msgid "can't create backup file '%s': %s\n"
-msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
+msgstr ""
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr ""
- #: g10/keygen.c:4020 g10/keygen.c:4159
-#, fuzzy, c-format
-#| msgid "writing public key to `%s'\n"
++#: g10/keygen.c:4038 g10/keygen.c:4185
+#, c-format
msgid "writing public key to '%s'\n"
-msgstr "skriver offentlig n�kkel til �%s�\n"
+msgstr ""
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
-msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
+msgstr ""
- #: g10/keygen.c:4167
-#, fuzzy, c-format
-#| msgid "error writing public keyring `%s': %s\n"
++#: g10/keygen.c:4193
+#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
-msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
+msgstr ""
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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:4270 g10/keygen.c:4393
-# Er dette entallsformen av denne strengen?
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, 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:4272 g10/keygen.c:4395
-# Er dette flertallsformen av denne og den forrige strengen?
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, 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:4283 g10/keygen.c:4406
-#, fuzzy
-#| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
++#: g10/keygen.c:4309 g10/keygen.c:4432
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:4294
++#: g10/keygen.c:4320
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:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
-msgstr "Virkelig opprette? (j/N)"
+msgstr ""
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr ""
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr ""
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr ""
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr ""
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr ""
- #: g10/keylist.c:468
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
++#: g10/keylist.c:467
+#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
-msgstr[0] "%d ubrukelige signaturer\n"
-msgstr[1] "%d ubrukelige signaturer\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keylist.c:563
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
++#: g10/keylist.c:480
++#, c-format
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 signatur ble ikke sjekket p� grunn av en feil\n"
-msgstr[1] "1 signatur ble ikke sjekket p� grunn av en feil\n"
++msgstr[0] ""
++msgstr[1] ""
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
-msgstr "N�kkelknippe"
+msgstr ""
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
-msgstr "hoppet over �%s�: %s\n"
+msgstr ""
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
-msgstr "Fingeravtrykk for prim�rn�kkel:"
+msgstr ""
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
-msgstr " Fingeravtrykk for prim�rn�kkel:"
+msgstr ""
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
-msgstr " Fingeravstrykk for undern�kkel:"
+msgstr ""
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
-msgstr " N�kkelfingeravtrykk ="
+msgstr ""
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
-msgstr " Serienummer for kort ="
+msgstr ""
- #: g10/keyring.c:1490
-#, fuzzy, c-format
-#| msgid "caching keyring `%s'\n"
++#: g10/keyring.c:1489
+#, c-format
msgid "caching keyring '%s'\n"
-msgstr "cacher n�kkelknippet �%s�\n"
+msgstr ""
- #: g10/keyring.c:1567
-#, fuzzy, c-format
-#| msgid "%lu keys cached so far (%lu signatures)\n"
++#: g10/keyring.c:1566
+#, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
-msgstr[0] "%lu n�kler cachet s� langt (%lu signaturer)\n"
-msgstr[1] "%lu n�kler cachet s� langt (%lu signaturer)\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
-#, fuzzy, c-format
-#| msgid "1 bad signature\n"
++#: g10/keyring.c:1584
+#, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
-msgstr[0] "1 ubrukelig signatur\n"
-msgstr[1] "1 ubrukelig signatur\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr ""
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr ""
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
msgid "disabled"
-msgstr "utkoblet"
+msgstr ""
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
-#, fuzzy, c-format
-#| msgid "refreshing %d keys from %s\n"
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
+#, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
-msgstr[0] "oppfrisker %d n�kler fra %s\n"
-msgstr[1] "oppfrisker %d n�kler fra %s\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, 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:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
-msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
+msgstr ""
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
-msgstr "ber om n�kkel %s fra %s\n"
+msgstr ""
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
-#, fuzzy
-#| msgid "no keyserver action!\n"
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
msgid "no keyserver known\n"
-msgstr "ingen handling for n�kkelserver!\n"
+msgstr ""
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr ""
- #: g10/keyserver.c:1863
-#, fuzzy, c-format
-#| msgid "requesting key %s from %s\n"
++#: g10/keyserver.c:1862
+#, c-format
msgid "requesting key from '%s'\n"
-msgstr "ber om n�kkel %s fra %s\n"
+msgstr ""
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, 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
++#: g10/mainproc.c:256
#, 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
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr ""
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, 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
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
-msgstr "offentlig n�kkel er %s\n"
+msgstr ""
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
-msgstr "offentlig n�kkel-kryptert data: god DEK\n"
+msgstr ""
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, 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:231
-# Do we really need to translate this string.
-# The must some bug in the code.
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
-msgstr " �%s�\n"
+msgstr ""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
-msgstr "kryptert med %s-n�kkel, ID %s\n"
+msgstr ""
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
-msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
+msgstr ""
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr ""
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr ""
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr ""
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr ""
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr ""
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr ""
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
-msgstr "dekryptering mislyktes: %s\n"
+msgstr ""
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
-msgstr "opprinnelig filnavn=�%.*s�\n"
+msgstr ""
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
-msgstr "ingen signatur ble funnet\n"
+msgstr ""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
-msgstr "D�RLIG signatur fra �%s�"
+msgstr ""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
-msgstr "Utg�tt signatur fra �%s�"
+msgstr ""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
-msgstr "God signatur fra �%s�"
+msgstr ""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr ""
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr ""
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
-msgstr "Signatur opprettet %s\n"
+msgstr ""
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
-msgstr " bruker %s n�kkel %s\n"
+msgstr ""
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
-msgstr "N�kkel tilgjengelig ved: "
+msgstr ""
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
-msgstr "[usikker]"
+msgstr ""
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
-msgstr " aka �%s�"
+msgstr ""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
-msgstr "Signatur utg�tt %s\n"
+msgstr ""
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
-msgstr "Signatur utg�r %s\n"
+msgstr ""
- #: g10/mainproc.c:2078
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
++#: g10/mainproc.c:2077
+#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
-msgstr "%s signatur, digestalgoritme %s\n"
+msgstr ""
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
msgid "binary"
-msgstr "bin�r"
+msgstr ""
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
-msgstr "tekstmodus"
+msgstr ""
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
-msgstr "ukjent"
+msgstr ""
- #: g10/mainproc.c:2082
-#, fuzzy
-#| msgid "unknown pubkey algorithm"
++#: g10/mainproc.c:2081
msgid ", key algorithm "
-msgstr "ukjent pubkey-algoritme"
+msgstr ""
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr ""
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr ""
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr ""
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr ""
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
-#, fuzzy, c-format
-#| msgid "fstat(%d) failed in %s: %s\n"
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
+#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
-msgstr "fstat(%d) mislyktes in %s: %s\n"
+msgstr ""
- #: g10/misc.c:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
-msgstr "fstat(%d) mislyktes in %s: %s\n"
+msgstr ""
- #: g10/misc.c:281
++#: g10/misc.c:279
#, 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:288
-#, fuzzy
++#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
-msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
+msgstr ""
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
+msgstr ""
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
+msgstr ""
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
+msgstr ""
- #: g10/misc.c:355
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
++#: g10/misc.c:353
+#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s signatur, digestalgoritme %s\n"
+msgstr ""
- #: g10/misc.c:377
-#, fuzzy, c-format
-#| msgid "read error in `%s': %s\n"
++#: g10/misc.c:375
+#, c-format
msgid "(reported error: %s)\n"
-msgstr "lesefeil ved �%s�: %s\n"
+msgstr ""
- #: g10/misc.c:380
-#, fuzzy, c-format
-#| msgid "read error in `%s': %s\n"
++#: g10/misc.c:378
+#, c-format
msgid "(reported error: %s <%s>)\n"
-msgstr "lesefeil ved �%s�: %s\n"
+msgstr ""
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr ""
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr ""
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
- #: g10/misc.c:1081
++#: g10/misc.c:1079
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
- #: g10/misc.c:1085
++#: g10/misc.c:1083
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr ""
- #: g10/misc.c:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr ""
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
msgstr ""
- #: g10/misc.c:1469
-#, fuzzy, c-format
-#| msgid "ambiguous option `%s'\n"
++#: g10/misc.c:1467
+#, c-format
msgid "ambiguous option '%s'\n"
-msgstr "flertydig valg �%s�\n"
+msgstr ""
- #: g10/misc.c:1494
-#, fuzzy, c-format
-#| msgid "unknown option `%s'\n"
++#: g10/misc.c:1492
+#, c-format
msgid "unknown option '%s'\n"
-msgstr "ukjent valg �%s�\n"
+msgstr ""
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
-#, fuzzy, c-format
-#| msgid "Unknown signature type `%s'\n"
++#: g10/misc.c:1752
+#, c-format
msgid "unknown weak digest '%s'\n"
-msgstr "Ukjent signaturtype �%s�\n"
+msgstr ""
- #: g10/openfile.c:85
-#, fuzzy, c-format
-#| msgid "File `%s' exists. "
++#: g10/openfile.c:84
+#, c-format
msgid "File '%s' exists. "
-msgstr "Fila �%s� finnes. "
+msgstr ""
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
-msgstr "Overskrive (j/N) "
+msgstr ""
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr ""
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
-msgstr "Tast inn nytt filnavn"
+msgstr ""
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
-msgstr "skriver til stdout\n"
+msgstr ""
- #: g10/openfile.c:367
-#, fuzzy, c-format
-#| msgid "assuming signed data in `%s'\n"
++#: g10/openfile.c:366
+#, c-format
msgid "assuming signed data in '%s'\n"
-msgstr "antar at signert data er i �%s�\n"
+msgstr ""
- #: g10/openfile.c:458
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
++#: g10/openfile.c:457
+#, c-format
msgid "new configuration file '%s' created\n"
-msgstr "ny konfigurasjonsfil �%s� ble opprettet\n"
+msgstr ""
- #: g10/openfile.c:499
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
++#: g10/openfile.c:498
+#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "ADVARSEL: valgene i �%s� er ikke aktive under denne kj�ringen\n"
+msgstr ""
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr ""
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr ""
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
-msgstr " (hovedn�kkelid %s)"
+msgstr ""
- #: g10/passphrase.c:278
-#, fuzzy, c-format
++#: g10/passphrase.c:277
+#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
"certificate:\n"
@@@ -5561,58 -4748,68 +5614,58 @@@
"%u-bit %s key, ID %s,\n"
"created %s%s.\n"
msgstr ""
-"Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for brukeren:\n"
-"�%.*s�\n"
-"%u-bit %s n�kkel, ID %s, opprettet %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
-msgstr "Tast inn passfrase\n"
+msgstr ""
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr ""
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr ""
-"Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for\n"
-"brukeren: �%s�\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
-msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
+msgstr ""
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
-#, fuzzy
++#: g10/passphrase.c:665
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
-"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
-"\n"
- #: g10/passphrase.c:670
-#, fuzzy
++#: g10/passphrase.c:669
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
-"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
-"\n"
- #: g10/passphrase.c:675
-#, fuzzy
++#: g10/passphrase.c:674
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
-"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
-"\n"
- #: g10/passphrase.c:678
-#, fuzzy
++#: g10/passphrase.c:677
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr ""
-"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
-"\n"
- #: g10/passphrase.c:683
-#, fuzzy
-#| msgid "Do you really want to delete the selected keys? (y/N) "
++#: g10/passphrase.c:682
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
-msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
+msgstr ""
- #: g10/passphrase.c:686
-#, fuzzy
-#| msgid "Do you really want to delete the selected keys? (y/N) "
++#: g10/passphrase.c:685
msgid "Do you really want to permanently delete the OpenPGP secret key:"
-msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
+msgstr ""
- #: g10/passphrase.c:695
-#, fuzzy, c-format
-#| msgid "%u-bit %s key, ID %s, created %s"
++#: g10/passphrase.c:694
+#, c-format
msgid ""
"%s\n"
"\"%.*s\"\n"
@@@ -5661,33 -4852,26 +5714,33 @@@ msgstr "
msgid "unable to display photo ID!\n"
msgstr ""
- #: g10/pkclist.c:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
-msgstr "Ingen grunn er angitt"
+msgstr ""
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
-msgstr "N�kkelen er overg�tt"
+msgstr ""
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
-msgstr "N�kkelen har blitt kompromittert"
+msgstr ""
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
-msgstr "N�kkelen er ikke lengre i bruk"
+msgstr ""
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
-msgstr "Brukerid er ikke lengre gyldig"
+msgstr ""
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
-msgstr "grunnen for opphevelse: "
+msgstr ""
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
-msgstr "kommentar til opphevelse: "
+msgstr ""
#. TRANSLATORS: These are the allowed answers in lower and
#. uppercase. Below you will find the matching strings which
@@@ -5699,373 -4883,314 +5752,373 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
-msgstr "iImMqQsS"
+msgstr ""
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
-msgstr "Ingen tillitsverdi tilordnet til:\n"
+msgstr ""
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
-msgstr " aka �%s�\n"
+msgstr ""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, 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:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
-msgstr " %d = Jeg stoler IKKE p� den\n"
+msgstr ""
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
-msgstr " %d = Jeg stoler fullstendig p� den\n"
+msgstr ""
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
-msgstr " m = tilbake til hovedmenyen\n"
+msgstr ""
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
-msgstr " s = hopp over denne n�kkelen\n"
+msgstr ""
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
-msgstr " q = avslutt\n"
+msgstr ""
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
-msgstr "Valget ditt? "
+msgstr ""
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
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:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
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:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
-msgstr "denne n�kkelen tilh�rer oss\n"
+msgstr ""
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
-msgstr "Bruke denne n�kkelen likevel? (j/N) "
+msgstr ""
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
-msgstr "ADVARSEL: Bruker ubetrodd n�kkel!\n"
+msgstr ""
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
-msgstr " Dette kan bety at signaturen er falsk.\n"
+msgstr ""
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
-msgstr "Merk: Denne n�kkelen har blitt utkoblet.\n"
+msgstr ""
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
-msgstr "Merk: Denne n�kkelen er utg�tt!\n"
+msgstr ""
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
-msgstr "ADVARSEL: Vi stoler IKKE p� denne n�kkelen!\n"
+msgstr ""
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
-msgstr " Signaturen er sannsynligvis et FALSKNERI.\n"
+msgstr ""
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
-msgstr "%s: hoppet over: %s\n"
+msgstr ""
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: hoppet over: offentlig n�kkel er utkoblet\n"
+msgstr ""
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, 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:943
-#, fuzzy, c-format
-#| msgid "can't close `%s': %s\n"
++#: g10/pkclist.c:958
+#, c-format
msgid "can't encrypt to '%s'\n"
-msgstr "kan ikke lukke �%s�: %s\n"
+msgstr ""
- #: g10/pkclist.c:958
-#, fuzzy, c-format
++#: g10/pkclist.c:973
+#, c-format
msgid "option '%s' given, but no valid default keys given\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
- #: g10/pkclist.c:965
-#, fuzzy, c-format
++#: g10/pkclist.c:980
+#, c-format
msgid "option '%s' given, but option '%s' not given\n"
-msgstr "ugyldig hashalgoritme �%s�\n"
+msgstr ""
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
msgstr ""
-"\n"
-"Tast inn brukeriden. Avslutt med en blank linje: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
-msgstr "Det finnes ingen slik brukerid.\n"
+msgstr ""
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
-msgstr "Offentlig n�kkel er utkoblet.\n"
+msgstr ""
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
-msgstr "hoppet over: offentlig n�kkel er allerede satt\n"
+msgstr ""
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
-msgstr "ukjent standardmottaker �%s�\n"
+msgstr ""
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
-msgstr "ingen gyldige adressater\n"
+msgstr ""
- #: g10/pkclist.c:1597
-#, fuzzy, c-format
++#: g10/pkclist.c:1612
+#, c-format
msgid "Note: key %s has no %s feature\n"
-msgstr "n�kkel %s: ingen brukerid\n"
+msgstr ""
- #: g10/pkclist.c:1622
-#, fuzzy, c-format
++#: g10/pkclist.c:1637
+#, c-format
msgid "Note: key %s has no preference for %s\n"
-msgstr "n�kkel %s: ingen brukerid\n"
+msgstr ""
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr ""
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr ""
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr ""
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr ""
- #: g10/plaintext.c:700
-#, fuzzy, c-format
++#: g10/plaintext.c:699
+#, c-format
msgid "can't open signed data '%s'\n"
-msgstr "kan ikke �pne �%s�: %s\n"
+msgstr ""
- #: g10/plaintext.c:735
-#, fuzzy, c-format
++#: g10/plaintext.c:734
+#, 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
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr ""
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr ""
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr ""
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr ""
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
-"p�tvinging av kompresjonsalgoritme %s bryter med mottakerens preferanser\n"
- #: g10/pubkey-enc.c:378
-#, fuzzy, c-format
-#| msgid "NOTE: secret key %s expired at %s\n"
++#: g10/pubkey-enc.c:377
+#, c-format
msgid "Note: secret key %s expired at %s\n"
-msgstr "NOTIS: hemmelig n�kkel %s utgikk den %s\n"
+msgstr ""
- #: g10/pubkey-enc.c:385
-#, fuzzy
++#: g10/pubkey-enc.c:384
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr ""
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
-msgstr "n�kkel %s: ingen brukerid\n"
+msgstr ""
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr ""
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr ""
- #: g10/revoke.c:323
-#, fuzzy
-#| msgid "Secret key is available.\n"
++#: g10/revoke.c:322
msgid "Secret key is not available.\n"
-msgstr "Hemmelig n�kkel er tilgjengelig\n"
+msgstr ""
- #: g10/revoke.c:328
++#: g10/revoke.c:327
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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr ""
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr ""
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr ""
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
- #: g10/revoke.c:552
-#, fuzzy
-#| msgid "Create a revocation certificate for this key? (y/N) "
++#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
-msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
+msgstr ""
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6074,41 -5199,37 +6127,41 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
-#, fuzzy, c-format
-#| msgid "key %s: \"%s\" revocation certificate imported\n"
++#: g10/revoke.c:590
+#, c-format
msgid "revocation certificate stored as '%s.rev'\n"
-msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
+msgstr ""
- #: g10/revoke.c:635
-#, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
++#: g10/revoke.c:634
+#, 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:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
-#, fuzzy, c-format
-#| msgid "error creating keyring `%s': %s\n"
++#: g10/revoke.c:688
+#, c-format
msgid "error searching the keyring: %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+msgstr ""
- #: g10/revoke.c:712
++#: g10/revoke.c:711
msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
+msgstr ""
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6119,518 -5240,449 +6172,518 @@@
"your machine might store the data and make it available to others!\n"
msgstr ""
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr ""
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr ""
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
- #: g10/revoke.c:823
++#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
- #: g10/revoke.c:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr ""
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr ""
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
-msgstr "Er dette i orden? (j/N) "
+msgstr ""
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 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
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
-"kan ikke unng� svak n�kkel for symmetrisk krypteringsalgorime; pr�vde %d "
-"ganger!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr ""
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
-msgstr "vennligst se %s for mer informasjon\n"
+msgstr ""
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
- #: g10/sig-check.c:275
++#: g10/sig-check.c:277
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/sig-check.c:284
-#, fuzzy, c-format
-#| msgid "key %s: \"%s\" %d new signatures\n"
++#: g10/sig-check.c:286
+#, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
-msgstr[0] "n�kkel: %s: �%s� %d nye signaturer\n"
-msgstr[1] "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/sig-check.c:298 g10/sign.c:238
-# Er dette entallsformen av denne strengen?
-#, fuzzy, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
++#: g10/sig-check.c:300 g10/sign.c:237
+#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgid_plural ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr[0] ""
-"n�kkel %s ble opprettet %lu sekund i fremtiden (time warp eller "
-"klokkeproblem)\n"
msgstr[1] ""
-"n�kkel %s ble opprettet %lu sekund i fremtiden (time warp eller "
-"klokkeproblem)\n"
- #: g10/sig-check.c:307
-# Er dette entallsformen av denne strengen?
-#, fuzzy, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
++#: g10/sig-check.c:309
+#, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
"key %s was created %lu days in the future (time warp or clock problem)\n"
msgstr[0] ""
-"n�kkel %s ble opprettet %lu sekund i fremtiden (time warp eller "
-"klokkeproblem)\n"
msgstr[1] ""
-"n�kkel %s ble opprettet %lu sekund i fremtiden (time warp eller "
-"klokkeproblem)\n"
- #: g10/sig-check.c:324
-#, fuzzy, c-format
-#| msgid "NOTE: signature key %s expired %s\n"
++#: g10/sig-check.c:326
+#, c-format
msgid "Note: signature key %s expired %s\n"
-msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
+msgstr ""
- #: g10/sig-check.c:335
-#, fuzzy, c-format
++#: g10/sig-check.c:337
+#, c-format
msgid "Note: signature key %s has been revoked\n"
-msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
+msgstr ""
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
- #: g10/sig-check.c:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, 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
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr ""
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr ""
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s/%s-signatur fra: �%s�\n"
+msgstr ""
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
-"ADVARSEL: p�tvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens "
-"preferanser\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr ""
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr ""
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
-msgstr "hoppet over �%s�: er duplikat\n"
+msgstr ""
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr ""
- #: g10/skclist.c:226
++#: g10/skclist.c:225
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
- #: g10/tdbdump.c:58 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr ""
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
"# (Use \"gpg --import-ownertrust\" to restore them)\n"
msgstr ""
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
-#, fuzzy, c-format
-#| msgid "error in `%s': %s\n"
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
+#, c-format
msgid "error in '%s': %s\n"
-msgstr "feil med �%s�: %s\n"
+msgstr ""
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
-msgstr "for lang linje"
+msgstr ""
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
-msgstr "ugyldig fingeravtrykk"
+msgstr ""
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
-msgstr "verdi for eiertillit mangler"
+msgstr ""
- #: g10/tdbdump.c:218
-#, fuzzy, c-format
-#| msgid "error finding trust record in `%s': %s\n"
++#: g10/tdbdump.c:217
+#, c-format
msgid "error finding trust record in '%s': %s\n"
-msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+msgstr ""
- #: g10/tdbdump.c:222
-#, fuzzy, c-format
-#| msgid "read error in `%s': %s\n"
++#: g10/tdbdump.c:221
+#, c-format
msgid "read error in '%s': %s\n"
-msgstr "lesefeil ved �%s�: %s\n"
+msgstr ""
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr ""
- #: g10/tdbio.c:141 sm/keydb.c:343
-#, fuzzy, c-format
-#| msgid "can't create lock for `%s'\n"
++#: g10/tdbio.c:140 sm/keydb.c:355
+#, c-format
msgid "can't create lock for '%s'\n"
-msgstr "kan ikke opprette l�s for �%s�\n"
+msgstr ""
- #: g10/tdbio.c:146
-#, fuzzy, c-format
-#| msgid "can't lock `%s'\n"
++#: g10/tdbio.c:145
+#, c-format
msgid "can't lock '%s'\n"
-msgstr "kan ikke l�se �%s�\n"
+msgstr ""
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr ""
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr ""
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:675
#, c-format
- msgid "can't access '%s': %s\n"
+ msgid "%s: directory does not exist!\n"
msgstr ""
- #: g10/tdbio.c:688
-#, fuzzy, c-format
-#| msgid "can't access `%s': %s\n"
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+#, c-format
- msgid "%s: directory does not exist!\n"
+ msgid "can't access '%s': %s\n"
-msgstr "kan ikke aksere �%s�: %s\n"
+msgstr ""
- #: g10/tdbio.c:711
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr ""
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr ""
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr ""
- #: g10/tdbio.c:776
-#, fuzzy
++#: g10/tdbio.c:781
msgid "Note: trustdb not writable\n"
-msgstr "hemmelig n�kkel er ikke tilgjengelig"
+msgstr ""
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr ""
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr ""
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr ""
- #: g10/tdbio.c:853 g10/tdbio.c:879 g10/tdbio.c:897 g10/tdbio.c:917
- #: g10/tdbio.c:952 g10/tdbio.c:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr ""
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr ""
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr ""
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr ""
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr ""
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr ""
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr ""
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr ""
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr ""
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr ""
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr ""
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr ""
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr ""
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr ""
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
-#, fuzzy, c-format
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
+#, c-format
msgid "error beginning transaction on TOFU database: %s\n"
-msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+msgstr ""
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
-#, fuzzy, c-format
++#: g10/tofu.c:512
+#, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
-"\n"
-"St�ttede algoritmer:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
-#, fuzzy, c-format
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
+#, c-format
msgid "error reading TOFU database: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/tofu.c:516 g10/tofu.c:524
-#, fuzzy, c-format
-#| msgid "error writing secret keyring `%s': %s\n"
++#: g10/tofu.c:577 g10/tofu.c:585
+#, c-format
msgid "error determining TOFU database's version: %s\n"
-msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
+msgstr ""
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
-#, fuzzy, c-format
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
+#, c-format
msgid "error initializing TOFU database: %s\n"
-msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+msgstr ""
- #: g10/tofu.c:700
-#, fuzzy, c-format
++#: g10/tofu.c:761
+#, c-format
msgid "error opening TOFU database '%s': %s\n"
-msgstr "feil med �%s�: %s\n"
+msgstr ""
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
-#, fuzzy, c-format
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
+#, c-format
msgid "error updating TOFU database: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
-msgstr "fant ikke offentlig n�kkel %s: %s\n"
+msgstr ""
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
-#, fuzzy, c-format
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
+#, c-format
msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
-#, fuzzy, c-format
-#| msgid "error getting new PIN: %s\n"
++#: g10/tofu.c:1937
+#, c-format
msgid "error gathering other user IDs: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgstr ""
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
-#, fuzzy, c-format
-#| msgid "validity: %s"
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
+#, c-format
msgid "policy: %s"
-msgstr "gyldighet: %s"
+msgstr ""
- #: g10/tofu.c:1957
-#, fuzzy, c-format
++#: g10/tofu.c:2018
+#, c-format
msgid "error gathering signature stats: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgstr ""
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
-#, fuzzy
-#| msgid "list keys"
++#: g10/tofu.c:2058
msgid "this key"
-msgstr "liste n�kler"
+msgstr ""
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
-#, fuzzy, c-format
++#: g10/tofu.c:2077
+#, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
-msgstr[0] "|algo [filer]|skrive meldingsdigester"
-msgstr[1] "|algo [filer]|skrive meldingsdigester"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -6640,172 -5692,153 +6693,183 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
-#, fuzzy, c-format
++#: g10/tofu.c:2224
+#, c-format
msgid "error changing TOFU policy: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
-#, fuzzy, c-format
++#: g10/tofu.c:2499
+#, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
+ msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [filer]|skrive meldingsdigester"
+msgstr ""
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
-#, fuzzy, c-format
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
+#, c-format
msgid "error opening TOFU database: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: g10/trustdb.c:216
-#, fuzzy, c-format
-#| msgid "`%s' is not a valid character set\n"
++#: g10/trustdb.c:215
+#, c-format
msgid "'%s' is not a valid long keyID\n"
-msgstr "�%s� er ikke et gyldig tegnsett\n"
+msgstr ""
- #: g10/trustdb.c:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
-msgstr "n�kkel %s: godtatt som betrodd n�kkel\n"
+msgstr ""
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr ""
- #: g10/trustdb.c:295
++#: g10/trustdb.c:294
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "n�kkel %s: ingen offentlig n�kkel for betrodd n�kkel - hoppet over\n"
+msgstr ""
- #: g10/trustdb.c:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
-msgstr "n�kkel %s markert som endelig betrodd.\n"
+msgstr ""
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr ""
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr ""
- #: g10/trustdb.c:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -6814,7 -5846,6 +6878,7 @@@
msgid "no need for a trustdb check\n"
msgstr ""
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr ""
@@@ -6860,34 -5884,27 +6924,34 @@@ msgstr "
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr ""
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -6899,56 -5916,44 +6963,56 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
-msgstr "[ opphevet]"
+msgstr ""
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
-msgstr "[ utg�tt]"
+msgstr ""
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
-msgstr "[ ukjent]"
+msgstr ""
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
-msgstr "[ udef ]"
+msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
"should be the first file given on the command line.\n"
msgstr ""
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr ""
- #: g10/verify.c:254
-#, fuzzy, c-format
++#: g10/verify.c:253
+#, c-format
msgid "can't open fd %d: %s\n"
-msgstr "kan ikke �pne �%s�: %s\n"
+msgstr ""
+#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@@ -7252,7 -6210,6 +7316,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7377,23 -6311,18 +7441,23 @@@ msgstr "
msgid "looking up issuer from the Dirmngr cache\n"
msgstr ""
-#, fuzzy, c-format
+#: sm/certchain.c:614
+#, c-format
msgid "number of matching certificates: %d\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/certchain.c:616
+#, c-format
msgid "dirmngr cache-only key lookup failed: %s\n"
-msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+msgstr ""
-#, fuzzy
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
-msgstr "klarte ikke � lagre n�kkelen: %s\n"
+msgstr ""
+#: sm/certchain.c:981
msgid "certificate has been revoked"
msgstr ""
@@@ -7860,198 -6720,170 +7924,198 @@@ msgstr "
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#, fuzzy, c-format
+#: sm/delete.c:51 sm/delete.c:112
+#, c-format
msgid "certificate '%s' not found: %s\n"
-msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+msgstr ""
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
-#, fuzzy, c-format
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
+#, c-format
msgid "error locking keybox: %s\n"
-msgstr "feil ved lesing av n�kkelblokk: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/delete.c:143
+#, c-format
msgid "duplicated certificate '%s' deleted\n"
-msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/delete.c:145
+#, c-format
msgid "certificate '%s' deleted\n"
-msgstr "preferansen %s er duplisert\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/delete.c:175
+#, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
-#, fuzzy
+#: sm/encrypt.c:328
msgid "no valid recipients given\n"
-msgstr "ingen gyldige adressater\n"
+msgstr ""
- #: sm/gpgsm.c:204
-#, fuzzy
++#: sm/gpgsm.c:207
msgid "list external keys"
-msgstr "liste hemmelige n�kler"
+msgstr ""
- #: sm/gpgsm.c:206
-#, fuzzy
++#: sm/gpgsm.c:209
msgid "list certificate chain"
-msgstr "ugyldig sertifikat"
+msgstr ""
- #: sm/gpgsm.c:213
-#, fuzzy
++#: sm/gpgsm.c:216
msgid "import certificates"
-msgstr "ugyldig sertifikat"
+msgstr ""
- #: sm/gpgsm.c:214
-#, fuzzy
++#: sm/gpgsm.c:217
msgid "export certificates"
-msgstr "ugyldig sertifikat"
+msgstr ""
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
-#, fuzzy
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
-msgstr "lage ASCII-beskyttet output"
+msgstr ""
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr ""
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
-#, fuzzy
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
-msgstr "leser valg fra �%s�\n"
+msgstr ""
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr ""
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr ""
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr ""
- #: sm/gpgsm.c:310
-#, fuzzy
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
-msgstr "hent n�klene fra dette n�kkelknippet"
+msgstr ""
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
- #: sm/gpgsm.c:341
-#, fuzzy
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
-msgstr "ukjent kryptoalgoritme"
+msgstr ""
- #: sm/gpgsm.c:343
-#, fuzzy
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
-msgstr "%s signatur, digestalgoritme %s\n"
+msgstr ""
- #: sm/gpgsm.c:559
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
++#: sm/gpgsm.c:564
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
-msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+msgstr ""
- #: sm/gpgsm.c:562
-#, fuzzy
++#: sm/gpgsm.c:567
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
"Default operation depends on the input data\n"
msgstr ""
-"Bruksm�te: gpg [valg] [filer]\n"
-"signere, sjekke, kryptere eller dekryptere\n"
-"standard operasjon avhenger av inputdata\n"
- #: sm/gpgsm.c:766
-#, fuzzy, c-format
++#: sm/gpgsm.c:771
+#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
-msgstr "kan ikke opprette �%s�: %s\n"
+msgstr ""
- #: sm/gpgsm.c:777
-#, fuzzy, c-format
++#: sm/gpgsm.c:782
+#, c-format
msgid "unknown validation model '%s'\n"
-msgstr "ukjent valg �%s�\n"
+msgstr ""
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
-#, fuzzy, c-format
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#, c-format
msgid "%s:%u: skipping this line\n"
-msgstr " s = hopp over denne n�kkelen\n"
+msgstr ""
- #: sm/gpgsm.c:1420
-#, fuzzy
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
-msgstr "kunne ikke parse n�kkelserverens URL\n"
+msgstr ""
- #: sm/gpgsm.c:1614
-#, fuzzy, c-format
++#: sm/gpgsm.c:1631
+#, c-format
msgid "importing common certificates '%s'\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
- #: sm/gpgsm.c:1655
-#, fuzzy, c-format
++#: sm/gpgsm.c:1672
+#, c-format
msgid "can't sign using '%s': %s\n"
-msgstr "kan ikke aksere �%s�: %s\n"
+msgstr ""
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8068,51 -6898,42 +8132,51 @@@ msgstr "
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
-#, fuzzy, c-format
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
+#, c-format
msgid "error getting stored flags: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/import.c:526 sm/import.c:558
+#, c-format
msgid "error importing certificate: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: sm/import.c:746 tools/gpg-connect-agent.c:1434
+#, c-format
msgid "error reading input: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: sm/keydb.c:1108 sm/keydb.c:1194
-#, fuzzy
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
-msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
+msgstr ""
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
-#, fuzzy, c-format
++#: sm/keydb.c:1174
+#, c-format
msgid "error finding writable keyDB: %s\n"
-msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+msgstr ""
- #: sm/keydb.c:1170
-#, fuzzy, c-format
++#: sm/keydb.c:1182
+#, c-format
msgid "error storing certificate: %s\n"
-msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+msgstr ""
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1243 sm/keydb.c:1332
-#, fuzzy, c-format
++#: sm/keydb.c:1255 sm/keydb.c:1344
+#, c-format
msgid "error storing flags: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
+#: sm/keylist.c:658
msgid "Error - "
msgstr ""
@@@ -8263,125 -7061,107 +8327,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:380
-#, fuzzy
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
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:384
++#: dirmngr/dirmngr-client.c:390
+#, 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 ""
-#, fuzzy, c-format
+#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
+#, 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 ""
@@@ -8868,11 -7566,11 +8932,11 @@@ msgstr "
msgid "force the use of the default OCSP responder"
msgstr ""
- #: dirmngr/dirmngr-client.c:150
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
++#: dirmngr/dirmngr-client.c:169
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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -8880,77 -7578,69 +8944,77 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
+#, 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:275
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:281
+#, c-format
msgid "error reading certificate from '%s': %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:311
+#, c-format
msgid "can't connect to the dirmngr: %s\n"
-msgstr "kan ikke �pne n�kkelknippet"
+msgstr ""
- #: dirmngr/dirmngr-client.c:327
-#, fuzzy, c-format
-#| msgid "update failed: %s\n"
++#: dirmngr/dirmngr-client.c:333
+#, c-format
msgid "lookup failed: %s\n"
-msgstr "oppdatering mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:342
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
++#: dirmngr/dirmngr-client.c:348
+#, c-format
msgid "loading CRL '%s' failed: %s\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:398
+#, c-format
msgid "validation of certificate failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
-#, fuzzy
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
msgid "certificate is valid\n"
-msgstr "preferansen %s er duplisert\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
-#, fuzzy
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
msgid "certificate has been revoked\n"
-msgstr "Denne n�kkelen er utg�tt!"
+msgstr ""
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
+#, c-format
msgid "certificate check failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:423
-#, fuzzy, c-format
-#| msgid "can't stat `%s': %s\n"
++#: dirmngr/dirmngr-client.c:429
+#, c-format
msgid "got status: '%s'\n"
-msgstr "kan ikke stat() �%s�: %s\n"
+msgstr ""
- #: dirmngr/dirmngr-client.c:438
-#, fuzzy, c-format
-#| msgid "error writing secret keyring `%s': %s\n"
++#: dirmngr/dirmngr-client.c:444
+#, 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:685
-#, fuzzy, c-format
++#: dirmngr/dirmngr-client.c:702
+#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
-"\n"
-"St�ttede algoritmer:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9082,42 -7753,38 +9146,42 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
-#, 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 ""
-#, 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:1360 dirmngr/server.c:1535
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
+#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
-#, fuzzy, c-format
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
+#, c-format
msgid "processing CRL from '%s' failed: %s\n"
-msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+msgstr ""
-#, fuzzy, c-format
+#: dirmngr/dirmngr.c:1591
+#, c-format
msgid "%s:%u: line too long - skipped\n"
-msgstr "for lang linje"
+msgstr ""
-#, 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 ""
-#, 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:1737
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
@@@ -9569,81 -8167,67 +9633,81 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
-#, fuzzy, c-format
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
+#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
-msgstr "signering mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: 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
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
+#, c-format
msgid "assuan_inquire failed: %s\n"
-msgstr "signering mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1227
-#, fuzzy, c-format
++#: dirmngr/server.c:1225
+#, c-format
msgid "fetch_cert_by_url failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
-#, fuzzy, c-format
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
+#, c-format
msgid "error sending data: %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
+msgstr ""
- #: dirmngr/server.c:1377
-#, fuzzy, c-format
++#: dirmngr/server.c:1375
+#, c-format
msgid "start_cert_fetch failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1410
-#, fuzzy, c-format
++#: dirmngr/server.c:1408
+#, c-format
msgid "fetch_next_cert failed: %s\n"
-msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
-#, fuzzy, c-format
++#: dirmngr/server.c:2397
+#, c-format
msgid "can't allocate control structure: %s\n"
-msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
+msgstr ""
- #: dirmngr/server.c:2409
-#, fuzzy, c-format
++#: dirmngr/server.c:2408
+#, c-format
msgid "failed to allocate assuan context: %s\n"
-msgstr "klarte ikke � lagre n�kkelen: %s\n"
+msgstr ""
- #: dirmngr/server.c:2430
-#, fuzzy, c-format
-#| msgid "failed to initialize the TrustDB: %s\n"
++#: dirmngr/server.c:2429
+#, c-format
msgid "failed to initialize the server: %s\n"
-msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
+msgstr ""
- #: dirmngr/server.c:2438
-#, fuzzy, c-format
-#| msgid "failed to store the creation date: %s\n"
++#: dirmngr/server.c:2437
+#, c-format
msgid "failed to the register commands with Assuan: %s\n"
-msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
+msgstr ""
- #: dirmngr/server.c:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
-#, fuzzy, c-format
-#| msgid "signing failed: %s\n"
++#: dirmngr/server.c:2496
+#, 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 ""
diff --cc po/hu.po
index b160fe9,539aa00..65892b6
--- a/po/hu.po
+++ b/po/hu.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc L�szl� <nfl at nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@@ -98,8 -82,6 +98,8 @@@ msgstr "K�rem, adja meg a jelsz�t! Ezt
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "rossz jelsz�"
@@@ -155,25 -126,11 +155,25 @@@ msgstr "rossz jelsz�
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -382,8 -300,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "jelsz�v�ltoztat�s"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,118 -309,87 +393,118 @@@ msgstr "
"Opci�k:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "b�besz�d� m�d"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "m�g sz�kszav�bb m�d"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "kulcsok keres�se kulcsszerveren"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "bizalmi adatb�zis friss�t�se"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nem t�mogatott"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -513,164 -398,124 +513,169 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: K�nyvt�rat l�trehoztam.\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, 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:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: kihagyva: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -686,8 -529,6 +691,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -695,9 -536,6 +700,9 @@@ msgstr "
"@Parancsok:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -707,46 -545,38 +712,46 @@@ msgstr "
"Opci�k:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "M�gsem"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@@ -810,8 -630,6 +815,8 @@@ msgstr "
msgid "Yes"
msgstr "igen"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -841,46 -656,38 +846,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "jelsz�v�ltoztat�s"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "kulcs enged�lyez�se"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -921,53 -721,42 +926,57 @@@ msgstr "%d%s v�d� algoritmus nem t�moga
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "Friss�t�s sikertelen: %s.\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -982,17 -769,18 +991,22 @@@ msgstr "Kommunik�ci�s probl�ma a gpg �g
msgid "problem setting the gpg-agent options\n"
msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
@@@ -1063,17 -837,18 +1077,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 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"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1401,7 -1109,6 +1420,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "nem feldolgozott"
@@@ -1411,22 -1117,14 +1430,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
@@@ -1465,88 -1156,74 +1479,94 @@@ msgstr "A(z) %08lX nyilv�nos kulcsot ne
msgid "waiting for lock %s...\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "P�nc�l: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "�rv�nytelen p�nc�lfejl�c: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "P�nc�lfejl�c: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "�rv�nytelen al��r�sfejl�c!\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "P�nc�lfejl�c: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "V�ratlan p�nc�l:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "�rv�nytelen k�t�jeles sor: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "Korai �llom�nyv�g (nincs CRC).\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "Hib�s form�j� CRC.\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC hiba; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "Hiba a z�r� sorban!\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"quoted printable karakter a p�nc�lban - val�sz�n�leg egy bugos MTA b�ne.\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "nem olvashat� forma"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1554,84 -1231,73 +1574,95 @@@ msgstr "
"Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
"jellel kell befejez�dj�n.\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
+ "jellel kell befejez�dj�n.\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "nem olvashat� forma"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "�rja be a jelsz�t: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Mit v�laszt? "
@@@ -1698,21 -1350,11 +1729,16 @@@ msgstr "Nincs hozz� tartoz� nyilv�nos k
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
@@@ -1810,13 -1433,10 +1836,13 @@@ msgstr "Milyen kulcsm�retet szeretne? (
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Milyen kulcsm�retet szeretne? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "Felkerek�tve %u bitre.\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1871,9 -1481,6 +1897,9 @@@ msgstr " (%d) RSA (csak titkos�t�s)\n
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "�rv�nytelen v�laszt�s.\n"
@@@ -1907,7 -1508,6 +1933,7 @@@ msgstr "Val�ban al��rja?
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "kil�p�s ebb�l a men�b�l"
@@@ -1916,7 -1515,6 +1942,7 @@@
msgid "show admin commands"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "megmutatja ezt a s�g�t"
@@@ -2000,169 -1580,132 +2026,169 @@@ msgstr "Egym�snak ellentmond� parancsok
msgid "Admin commands are not allowed\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "Nem tudom megnyitni %s-t!\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(Kiv�ve, ha megad egy kulcsot az ujjlenyomat�val.)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
#, 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:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "T�r�ljem ezt a kulcsot a kulcskarik�r�l? "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Ez egy titkos kulcs! Val�ban t�r�ljem? "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "key"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Nyilv�nos kulcs� (pubkey): "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "Kulcstulajdonos megb�zhat�s�gi adatait t�r�ltem.\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "Nem tudok szimmetrikus ESK csomagot haszn�lni a S2K m�d miatt!\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "%s rejtjelez�st haszn�lok.\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "\"%s\" m�r t�m�r�tett.\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "Olvasok a \"%s\" �llom�nyb�l.\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, 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"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, 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"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s titkos�tott adat.\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"FIGYELEM: Az �zenet szimmetrikus titkos�t�s�t gyenge kulccsal v�gezt�k.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "Probl�ma a titkos�tott csomag kezel�sekor!\n"
@@@ -2224,140 -1756,112 +2250,140 @@@ 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:79
++#: g10/export.c:78
#, 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:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "haszn�lhatatlan titkos kulcs"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: kihagyva: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "FIGYELEM: Semmit sem export�ltam.\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[ismeretlen kulcs]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
@@@ -2367,11 -1870,9 +2393,11 @@@
msgid "make a clear text signature"
msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "adat titkos�t�sa"
@@@ -2379,15 -1879,12 +2405,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "adat visszafejt�se (alap�rtelmez�s)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "al��r�s ellen�rz�se"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "kulcsok list�z�sa"
@@@ -2400,15 -1895,12 +2426,15 @@@ msgstr "kulcsok �s al��r�sok list�z�sa
msgid "list and check key signatures"
msgstr "kulcsal��r�sok ellen�rz�se"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "kulcsok �s ujjlenyomatok list�z�sa"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "titkos kulcsok list�z�sa"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "�j kulcsp�r l�trehoz�sa"
@@@ -2432,7 -1920,6 +2458,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "visszavon�si igazol�s k�sz�t�se"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
@@@ -2464,7 -1945,6 +2490,7 @@@ msgstr "kulcs al��r�sa helyileg
msgid "sign or edit a key"
msgstr "kulcs al��r�sa vagy szerkeszt�se"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "jelsz�v�ltoztat�s"
@@@ -2514,24 -1983,19 +2540,24 @@@ msgstr "bizalmi adatb�zis friss�t�se
msgid "print message digests"
msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|N�V|titkos�t�s N�V r�sz�re"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
@@@ -2545,12 -2007,10 +2571,12 @@@ msgstr "|N|t�m�r�t�si szint be�ll�t�sa
msgid "use canonical text mode"
msgstr "kanonikus sz�veges m�d haszn�lata"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "ne csin�ljon semmi v�ltoztat�st"
@@@ -2562,7 -2020,6 +2588,7 @@@ msgstr "fel�l�r�s el�tt r�k�rdez�s
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2570,7 -2027,6 +2596,7 @@@ msgstr "
"@\n"
"(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2590,13 -2046,11 +2616,13 @@@ msgstr "
" --list-keys [nevek] kulcsok ki�rat�sa\n"
" --fingerprint [nevek] ujjlenyomatok ki�rat�sa\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2611,7 -2065,6 +2637,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:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2619,602 -2072,473 +2645,602 @@@ msgstr "
"\n"
"T�mogatott algoritmusok:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Nyilv�nos kulcs� (pubkey): "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Rejtjelez� (cipher): "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Kivonatol� (hash): "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "T�m�r�t� (compression): "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "Haszn�lat: gpg [opci�k] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, 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:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, 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:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, 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:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "kulcs tilt�sa"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, 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:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, 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:3265
++#: g10/gpg.c:3272
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �rtelmetlen %s mellett!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, 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:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [f�jln�v]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [f�jln�v]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Visszafejt�s sikertelen: %s.\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [f�jln�v]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [f�jln�v]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [f�jln�v]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [f�jln�v]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [f�jln�v]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key felh-azonos�t�"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key felh-azonos�t�"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key felh-azonos�t� [parancsok]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key felh-azonos�t�"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "Kulcsexport�l�s sikertelen: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "Kulcsexport�l�s sikertelen: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, 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:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[f�jln�v]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Kezdheti g�pelni az �zenetet...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
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:4942
++#: g10/gpg.c:4949
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:4975
++#: g10/gpg.c:4982
#, 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"
@@@ -3228,7 -2550,6 +3254,7 @@@ msgstr "a megadott kulcskarik�r�l vegy
msgid "make timestamp conflicts only a warning"
msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
@@@ -3255,326 -2572,260 +3281,326 @@@ msgstr "Nem �ll rendelkez�sre seg�ts�g.
msgid "No help available for '%s'"
msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "bizalmi adatb�zis friss�t�se"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "bizalmi adatb�zis friss�t�se"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "haszn�lhatatlan titkos kulcs"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "%d t�pus� blokkot kihagyom.\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr " �sszesen feldolgoztam: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " �j kulcsok kihagyva: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " �j kulcsok kihagyva: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " felh. azonos�t� n�lk�l: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " import�lva: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " v�ltozatlan: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " �j felh. azonos�t�k: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " �j alkulcsok: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " �j al��r�sok: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " �j kulcsvisszavon�sok: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " olvasott titkos kulcsok: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " import�lt titkos kulcsok: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "v�ltozatlan titkos kulcsok: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nem import�lt: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " �j al��r�sok: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " olvasott titkos kulcsok: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "Kihagytam \"%s\"-t: %s.\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, 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:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, 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:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, 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:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, 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:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
@@@ -3590,201 -2841,179 +3616,221 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, 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:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, 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:2109
++#: g10/import.c:2108
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
- #: g10/import.c:2122
++#: g10/import.c:2121
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, 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:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, 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:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[visszavon�s]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[�nal��r�s]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d rossz al��r�s.\n"
- msgstr[1] "%d rossz al��r�s.\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "J� al��r�s a k�vetkez�t�l: \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "Kihagytam \"%s\"-t: %s.\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+ msgstr[1] "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3792,23 -3021,25 +3838,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
msgstr[1] "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 al��r�st nem ellen�riztem hiba miatt.\n"
- msgstr[1] "1 al��r�st nem ellen�riztem hiba miatt.\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d rossz al��r�s.\n"
+ msgstr[1] "%d rossz al��r�s.\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
- msgstr[1] "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "J� al��r�s a k�vetkez�t�l: \""
+ msgstr[1] "J� al��r�s a k�vetkez�t�l: \""
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3821,68 -3052,53 +3873,68 @@@ msgstr "
"k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = r�szlegesen megb�zom benne\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = teljesen megb�zom benne\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Nem tudom al��rni.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Val�ban al��rja? "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3891,11 -3107,9 +3943,11 @@@ msgstr "
"\"%s\" �nal��r�sa\n"
"PGP 2.x st�lus�.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3904,11 -3118,9 +3956,11 @@@ msgstr "
"Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
"kulcson lej�rt.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3917,43 -3129,34 +3969,43 @@@ msgstr "
"Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
"kulcson helyi al��r�s.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, 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:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "M�g egyszer al� akarja �rni? (i/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Ez a kulcs lej�rt!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Ez a kulcs lej�r: %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3962,32 -3165,26 +4014,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:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nem v�laszolok.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, 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:953
++#: g10/keyedit.c:1466
#, 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:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Nagyon alaposan ellen�riztem.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3996,269 -3193,211 +4048,265 @@@ msgstr "
"Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
"az �n kulcs�val: \""
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ez egy �nal��r�s lesz.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, 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:1010
++#: g10/keyedit.c:1523
#, 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:1020
++#: g10/keyedit.c:1533
#, 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:1027
++#: g10/keyedit.c:1540
#, 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:1034
++#: g10/keyedit.c:1547
#, 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:1039
++#: g10/keyedit.c:1552
#, 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:1044
++#: g10/keyedit.c:1557
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Val�ban al��rja? "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "ment�s �s kil�p�s"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Al��r�s-jel�l�s: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "al��r�sok visszavon�sa"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "kulcs helyi al��r�sa"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, 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:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "fot�azonos�t� hozz�ad�sa"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "felhaszn�l�i azonos�t� t�rl�se"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "m�sodlagos kulcs t�rl�se"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "visszavon� kulcs hozz�ad�sa"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, 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:1430
++#: g10/keyedit.c:1896
#, 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:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "preferenci�k list�z�sa (szak�rt�)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "preferenci�k list�z�sa (r�szletes)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, 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:1441
++#: g10/keyedit.c:1907
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
#, 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:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "jelsz�v�ltoztat�s"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, 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:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "felhaszn�l�i azonos�t� visszavon�sa"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "m�sodlagos kulcs visszavon�sa"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "kulcs enged�lyez�se"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "kulcs tilt�sa"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "fot�azonos�t� megmutat�sa"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Titkos kulcs rendelkez�sre �ll.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4266,267 -3405,215 +4314,273 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "A kulcsot visszavont�k."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, 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:1788
++#: g10/keyedit.c:2254
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:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "ismeretlen al��r�soszt�ly"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
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:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
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:1853
++#: g10/keyedit.c:2319
#, 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:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, 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:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, 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:2031
++#: g10/keyedit.c:2497
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Val�ban t�rli ezt a kulcsot? "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
#, 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:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Val�ban visszavonja ezt a kulcsot? "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Val�ban visszavonja ezt a kulcsot? "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "preferencialista be�ll�t�sa"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, 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:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Val�ban friss�tsem a preferenci�kat? "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Mentsem a v�ltoztat�sokat? "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Kil�pjek ment�s n�lk�l? "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
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:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "�rv�nytelen �rt�k!\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Kivonat: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Jellemz�k: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Jel�l�s: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr " (�rz�keny)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s nem hozhat� l�tre: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[visszavont] "
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [lej�r: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [lej�r: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, fuzzy, c-format
msgid "usage: %s"
msgstr " bizalom: %c/%c"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " bizalom: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Ez a kulcs tiltott."
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4534,19 -3621,14 +4588,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[visszavont] "
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4554,17 -3636,14 +4608,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4574,35 -3653,27 +4628,35 @@@ msgstr "
"okozhatja,\n"
" hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4610,38 -3681,31 +4664,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "T�r�ltem %d al��r�st.\n"
msgstr[1] "T�r�ltem %d al��r�st.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Nem t�r�ltem semmit.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
#, fuzzy
msgid "invalid"
msgstr "�rv�nytelen p�nc�l"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
msgstr[1] "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, 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:3783
++#: g10/keyedit.c:4302
#, 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:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4651,275 -3715,217 +4705,275 @@@ msgstr "
" azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
"kulcsot!\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
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:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
#, 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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
#, 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:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
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:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Al��r�s-jel�l�s: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Fel�l�rjam (i/N)? "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "Felhaszn�l�azonos�t�: \""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (nem export�lhat�)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
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:5232
++#: g10/keyedit.c:5856
#, fuzzy
msgid "Not signed by you.\n"
msgstr " al��rva %08lX �ltal %s%s id�pontban.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr " (nem export�lhat�)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " visszavonva %08lX �ltal %s id�pontban.\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "Nincs titkos kulcs.\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, 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:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, 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:5571
++#: g10/keyedit.c:6195
#, 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:5668
++#: g10/keyedit.c:6292
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "%c%lu preferencia k�tszer szerepel!\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "T�l sok \"%c\" preferencia.\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "T�l sok \"%c\" preferencia.\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "T�l sok \"%c\" preferencia.\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "Sima al��r�st �rok.\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "�nal��r�st �rok.\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "�sszef�z� al��r�st �rok.\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "adat titkos�t�sa"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -4933,157 -3939,126 +4987,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (csak titkos�t�s)\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (csak al��r�s)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (csak al��r�s)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (csak titkos�t�s)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (csak titkos�t�s)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (csak titkos�t�s)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (csak titkos�t�s)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (csak al��r�s)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (csak titkos�t�s)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (csak titkos�t�s)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (csak titkos�t�s)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Al��r�s-jel�l�s: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Milyen kulcsm�retet szeretne? (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Milyen kulcsm�retet szeretne? (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "A k�v�nt kulcsm�ret %u bit.\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "Felkerek�tve %u bitre.\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5099,7 -4074,6 +5153,7 @@@ msgstr "
" <n>m = a kulcs n h�napig �rv�nyes\n"
" <n>y = a kulcs n �vig �rv�nyes\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5115,40 -4089,32 +5169,40 @@@ msgstr "
" <n>m = az al��r�s n h�napig �rv�nyes\n"
" <n>y = az al��r�s n �vig �rv�nyes\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Meddig �rv�nyes a kulcs? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Meddig �rv�nyes az al��r�s? (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "�rv�nytelen �rt�k!\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s soha nem j�r le.\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s soha nem j�r le.\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s lej�r: %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Az al��r�s lej�r: %s.\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5156,12 -4122,10 +5210,12 @@@ msgstr "
"Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
"Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Ez �gy helyes (i/n)? "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5172,7 -4136,6 +5226,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5189,50 -4152,39 +5243,50 @@@ msgstr "
" \"Heinrich Heine (a k�lt�) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Teljes n�v: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "�rv�nytelen karakter a n�vben!\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "E-mail c�m: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Ez nem �rv�nyes e-mail c�m.\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Megjegyz�s: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5243,7 -4195,6 +5297,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5258,37 -4209,30 +5312,37 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnMmEeRrKk"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5300,12 -4244,10 +5354,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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kulcsgener�l�s sikertelen: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5313,68 -4255,55 +5367,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" m�r t�m�r�tett.\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "M�gis l�trehozzam? "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "M�gis l�trehozzam? "
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
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:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5384,66 -4313,53 +5438,66 @@@ msgstr "
"k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
"teheti meg.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, 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:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, 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:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
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:4298
++#: g10/keygen.c:4324
#, 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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Val�ban l�trehozzam? "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "soha "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Kritikus al��r�si elj�r�sm�d: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Al��r�si elj�r�sm�d: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Kritikus al��r�s-jel�l�s: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Al��r�s-jel�l�s: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5451,69 -4367,63 +5505,77 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d rossz al��r�s.\n"
msgstr[1] "%d rossz al��r�s.\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 al��r�st nem ellen�riztem hiba miatt.\n"
+ msgstr[1] "1 al��r�st nem ellen�riztem hiba miatt.\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Kulcskarika"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "Kihagytam \"%s\"-t: %s.\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Els�dlegeskulcs-ujjlenyomat:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr "Els�dlegeskulcs-ujjlenyomat:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " Kulcs ujjlenyomata ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
msgstr[1] "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5521,535 -4431,428 +5583,535 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 rossz al��r�s.\n"
msgstr[1] "1 rossz al��r�s.\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: Kulcskarik�t l�trehoztam.\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, 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:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
msgstr[1] "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, 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:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr ""
"FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s titkos�tott munkafolyamatkulcs\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "Nyilv�nos kulcs: %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "Titkos�tva %u bites %s kulccsal, azonos�t�: %08lX, l�trehozva: %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " azaz \""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "%lu jelsz�val rejtjelezve\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "1 jelsz�val rejtjelezve\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s titkos�tott adatot felt�telezek.\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"IDEA rejtjelez� nem �ll rendelkez�sre, optimista m�don megpr�b�lok\n"
"%s-t haszn�lni helyette.\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "Visszafejt�s rendben.\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "Visszafejt�s sikertelen: %s.\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Eredeti f�jln�v: '%.*s'.\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
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:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "J� al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "J� al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, 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:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Az al��r�s lej�rt: %s.\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " azaz \""
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
- #: g10/mainproc.c:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Kulcs tal�lhat�: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[bizonytalan]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " azaz \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Az al��r�s lej�rt: %s.\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Az al��r�s lej�r: %s.\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "Bin�ris"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "Sz�vegm�d�"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "Ismeretlen m�d�"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "Nem k�l�n�ll� al��r�s.\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, 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:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, 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:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
#, 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:302
++#: g10/misc.c:300
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "nem megval�s�tott rejtjelez� algoritmus"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, 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:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "Olvas�si hiba: %s.\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "Olvas�si hiba: %s.\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: Elavult opci�: \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
- #: g10/misc.c:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "t�m�r�tetlen"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "t�m�r�tetlen"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "ismeretlen al��r�soszt�ly"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "\"%s\" �llom�ny l�tezik. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Fel�l�rjam (i/N)? "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: ismeretlen v�gz�d�s.\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "�rja be az �j �llom�nynevet"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "�rok a szabv�nyos kimenetre.\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "Azt felt�telezem, hogy az al��rt adat a %s �llom�nyban van.\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "\"%s\" �j konfigur�ci�s �llom�nyt l�trehoztam.\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr ""
"FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr ""
" \n"
" (f� kulcsazonos�t�: %08lX)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6063,15 -4866,12 +6125,15 @@@ msgstr "
"\"%.*s\"\n"
"%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "�rja be a jelsz�t!\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6082,47 -4882,38 +6144,47 @@@ msgstr "
"haszn�lat�hoz:\n"
"\""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6178,31 -4961,24 +6240,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Nincs megadva ok."
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "A kulcsot lecser�lt�k."
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "A kulcs kompromitt�l�dott."
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "A kulcs m�r nem haszn�latos."
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "Visszavon�s oka: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "Megjegyz�s a visszavon�shoz: "
@@@ -6216,100 -4992,81 +6278,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iIfFkKhH"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, 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:259
++#: g10/pkclist.c:258
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " azaz \""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, 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:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Nem tudom\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NEM b�zom benne\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = alapvet�en megb�zom benne\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " f = visszat�r�s a f�men�be\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " h = kulcs kihagy�sa\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " k = kil�p�s\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Mit v�laszt? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, 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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Alapvet�en megb�zhat� kulcshoz vezet� igazol�sok:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
#, 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:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Ez a kulcs hozz�nk tartozik.\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6321,131 -5078,103 +6383,131 @@@ msgstr "
"a k�vetkez� k�rd�sre v�laszolhat igennel.\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "M�gis haszn�ljuk ezt a kulcsot? "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "FIGYELEM: Nem b�zunk a kulcsban, amit haszn�lunk!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
#, 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:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Az al��r�s val�sz�n�leg HAMIS.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: kihagyva: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6453,169 -5182,133 +6515,169 @@@ msgstr "
"\n"
"Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "Nincsenek �rv�nyes c�mzettek!\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, 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:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "K�l�n�ll� al��r�s.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "Olvasom a szabv�nyos bemenetet...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "Nincs al��rt adat.\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "Anonim c�mzett. A %08lX titkos kulcsot pr�b�lom...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "Rendben, mi vagyunk az anonim c�mzett.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "A DEK r�gi k�dol�sa nem t�mogatott.\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "A %d%s rejtjelez� algoritmus ismeretlen vagy tiltott.\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "MEGJEGYZ�S: %d rejtjelez� algoritmus nincs a preferenci�k k�z�tt.\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet sikertelen: %s.\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Visszavonja:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Ez egy �rz�keny visszavon� kulcs.)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, 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
++#: g10/revoke.c:327
#, 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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet sikertelen: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Visszavon� igazol�s l�trehozva.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, 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:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6624,20 -5317,17 +6686,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Visszavon� igazol�s l�trehozva.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
@@@ -6645,23 -5335,19 +6707,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6679,92 -5365,74 +6741,92 @@@ 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:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "M�gsem"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, 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:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Visszavon�s oka: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Nincs le�r�s.)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Ez �gy rendben van? "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "Gyenge kulcs j�tt l�tre. �jrapr�b�lom.\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"Nem tudom elker�lni a gyenge kulcsot a szimmetrikus titkos�t�hoz.\n"
"%d alkalommal pr�b�ltam!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "FIGYELEM: Al��r�skivonat-konfliktus az �zenetben.\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, 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:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
msgstr[1] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
msgstr[1] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6775,7 -5443,6 +6837,7 @@@ msgstr[0] "
msgstr[1] ""
"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6785,41 -5452,34 +6847,41 @@@ msgstr[0] "
msgstr[1] ""
"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"FIGYELEM: Nem tudom kifejteni a %% jeleket a jel�l�sben (t�l hossz�).\n"
"Kifejt�s n�lk�l haszn�lom.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6828,7 -5488,6 +6890,7 @@@ msgstr "
"hossz�).\n"
"Kifejt�s n�lk�l haszn�lom.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6838,12 -5497,10 +6900,12 @@@ msgstr "
"hossz�).\n"
"Kifejt�s n�lk�l haszn�lom.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6851,43 -5508,35 +6913,43 @@@ msgstr "
"%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
"a c�mzett preferenci�ival.\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "Al��rom:"
- #: g10/sign.c:1256
++#: 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:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"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:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6896,340 -5545,274 +6958,340 @@@ msgstr "
"# Meghat�rozott bizalmi �rt�kek list�ja, %s.\n"
"# (Haszn�lja a \"gpg --import-ownertrust\" parancsot a vissza�ll�t�shoz!)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "A sor t�l hossz�!\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr "bizalmi �rt�kek importja"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "Hiba bizalmi rekord keres�sekor: %s.\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "Olvas�si hiba: %s.\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "Nem tudom megnyitni %s-t!\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "Bizalmi adatb�zis %lu. rekord: �r�s sikertelen (n=%d): %s.\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
- #: 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"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: K�nyvt�r nem l�tezik!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 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"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: Nem siker�lt verzi�rekordot l�trehoznom: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: �rv�nytelen bizalmi adatb�zis j�tt l�tre.\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "MEGJEGYZ�S: Bizalmi adatb�zis nem �rhat�.\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: Nem bizalmi adatb�zis.\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: Nem siker�lt egy rekord null�z�sa: %s.\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: Nem siker�lt egy rekord hozz�ad�sa: %s.\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "Nem tudok %d karaktern�l hosszabb sz�vegsorokat kezelni!\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"T�mogatott algoritmusok:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Elj�r�sm�d: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "kulcsok list�z�sa"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
msgstr[1] "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7239,174 -5822,154 +7301,185 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "%08lX kulcs: Elfogadva megb�zhat� kulcsk�nt.\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, 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:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7415,7 -5977,6 +7488,7 @@@
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:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
@@@ -7462,35 -6015,28 +7535,35 @@@ msgstr "Nem tal�ltam alapvet�en megb�zh
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, 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"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
#, fuzzy
msgid "never"
msgstr "soha "
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7502,42 -6048,33 +7575,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "[visszavont] "
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "[lej�rt] "
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "Ismeretlen m�d�"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7547,12 -6084,10 +7620,12 @@@ msgstr "
"Ne felejtse el, hogy az al��r�st tartalmaz� �llom�nyt (.sig vagy .asc)\n"
"kell az els� helyre �rni a parancssorban!\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "A bemeneti sor (%u) t�l hossz�, vagy hi�nyzik a soremel�s.\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@@ -7881,7 -6348,6 +7954,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8026,9 -6462,6 +8099,9 @@@ msgstr "Hiba a jelsz� l�trehoz�sakor: %
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
@@@ -8537,7 -6865,6 +8610,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
@@@ -8562,134 -6885,104 +8635,134 @@@ msgstr "A kulcsblokk t�rl�se sikertelen
msgid "no valid recipients given\n"
msgstr "(Nincs le�r�s.)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "titkos kulcsok list�z�sa"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "rossz igazol�s"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "rossz igazol�s"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "rossz igazol�s"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "ne haszn�lja a termin�lt egy�ltal�n"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "k�tegelt m�d: soha nem k�rdez"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8700,47 -6993,38 +8773,47 @@@ msgstr "
"Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
"Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Nincs le�r�s.)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " h = kulcs kihagy�sa\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "�rok a \"%s\" �llom�nyba.\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8758,7 -7039,6 +8831,7 @@@ msgstr "visszavon�si igazol�s k�sz�t�se
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@@ -8773,32 -7051,26 +8846,32 @@@ msgstr "Hiba a jelsz� l�trehoz�sakor: %
msgid "error reading input: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@@ -8977,7 -7216,6 +9050,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "Visszavon� igazol�s l�trehozva.\n"
@@@ -8987,8 -7224,6 +9060,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:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@@ -9595,13 -7707,11 +9668,13 @@@ msgstr "rossz igazol�s
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:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9609,85 -7719,69 +9682,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "%c%lu preferencia k�tszer szerepel!\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"T�mogatott algoritmusok:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9842,12 -7902,10 +9915,12 @@@ msgstr "Haszn�lat: gpg [opci�k]
msgid "colons are not allowed in the socket name\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
@@@ -10342,77 -8298,61 +10415,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, 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:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/id.po
index f36d81b,c017cd4..f3e6a8e
--- a/po/id.po
+++ b/po/id.po
@@@ -10,7 -10,6 +10,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h at gmx.net>\n"
"Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@@ -103,8 -87,6 +103,8 @@@ msgstr "Silakan masukkan passphrase; in
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "passphrase yang buruk"
@@@ -160,25 -131,11 +160,25 @@@ msgstr "passphrase yang buruk
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -387,8 -305,6 +387,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "ubah passphrase"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -398,118 -314,87 +398,118 @@@ msgstr "
"Pilihan:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detil"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "lebih diam"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "cari kunci di key server"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "perbarui database trust"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NAMA|set charset terminal ke NAMA"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "tidak didukung"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -518,164 -403,124 +518,169 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: direktori tercipta\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: tidak dapat membuat direktori: %s\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: dilewati: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -691,8 -534,6 +696,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -700,9 -541,6 +705,9 @@@ msgstr "
"@Perintah:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -712,46 -550,38 +717,46 @@@ msgstr "
"Pilihan:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "Batal"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -815,8 -635,6 +820,8 @@@ msgstr "
msgid "Yes"
msgstr "y|ya"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -846,46 -661,38 +851,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "ubah passphrase"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Anda ingin menghapus kunci terpilih ini? "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "aktifkan kunci"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -926,53 -726,42 +931,57 @@@ msgstr "algoritma proteksi %d%s tidak d
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "kesalahan membaca `%s': %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "gagal memperbarui: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -987,17 -774,18 +996,22 @@@ msgstr "masalah komunikasi dengan gpg-a
msgid "problem setting the gpg-agent options\n"
msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "dibatalkan oleh user\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "tidak dapat meniadakan core dump: %s\n"
@@@ -1068,17 -842,18 +1082,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, fuzzy, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "kesalahan menulis keyring `%s': %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1406,7 -1114,6 +1425,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "tidak diproses"
@@@ -1416,22 -1122,14 +1435,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "opsi impor tidak valid\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "anda menemukan kesalahan ...(%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "gagal enarmoring: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "tidak dapat membuka file: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
@@@ -1470,89 -1161,75 +1484,95 @@@ msgstr "kunci publik %08lX tidak ditemu
msgid "waiting for lock %s...\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "armor: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "header armor tidak valid: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "header armor: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "header clearsig tidak valid\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "header armor: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "signature teks bersarang\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "armor tidak terduga:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "dash escaped line tidak valid: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "karakter radix64 tidak valid %02x dilewati\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "eof prematur (tanpa CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "eof prematur (dalam CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "CRC tidak tepat\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "kesalahan CRC; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "eof prematur (dalam Trailer)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "kesalahan dalam garis trailer\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armor tidak valid: baris melebihi %d karakter\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
"mengandung bug\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "tidak dapat dibaca manusia"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1560,84 -1237,73 +1580,95 @@@ msgstr "
"nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
"dan diakhiri dengan sebuah '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
+ "dan diakhiri dengan sebuah '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "tidak dapat dibaca manusia"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Masukkan passphrase: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "kunci rahasia tidak tersedia"
- #: g10/card-util.c:92 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Pilihan anda? "
@@@ -1704,21 -1356,11 +1735,16 @@@ msgstr "tidak ada kunci publik yang ses
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
@@@ -1816,13 -1439,10 +1842,13 @@@ msgstr "Keysize yang anda inginkan? (10
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1877,9 -1487,6 +1903,9 @@@ msgstr " (%d) RSA (hanya enkripsi)\n
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Pilihan tidak valid.\n"
@@@ -1913,7 -1514,6 +1939,7 @@@ msgstr "Ditandai?
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "berhenti dari menu ini"
@@@ -1922,7 -1521,6 +1948,7 @@@
msgid "show admin commands"
msgstr "perintah saling konflik\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "tampilkan bantuan"
@@@ -2006,169 -1586,132 +2032,169 @@@ msgstr "perintah saling konflik\n
msgid "Admin commands are not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Perintah tidak valid (coba \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output tidak berfungsi untuk perintah ini\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "tidak dapat membuka `%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "gagal membaca keyblock: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/delkey.c:130 g10/delkey.c:137
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(kecuali anda menspesifikasikan kunci dengan fingerprint)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
#, 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:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Menghapus kunci ini dari keyring? "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "kunci"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Pubkey: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "informasi ownertrust dihapus\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "menggunakan cipher %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' sudah dikompresi\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "PERINGATAN: `%s' adalah file kosong\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "Membaca dari `%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s dienkripsi untuk: %s\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s data terenkripsi\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "masalah menangani paket terenkripsi\n"
@@@ -2229,138 -1761,110 +2255,138 @@@ 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:79
++#: g10/export.c:78
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "kunci rahasia tidak dapat dipakai"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: dilewati: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "PERINGATAN: tidak ada yang diekspor\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[User id tidak ditemukan]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opsi impor tidak valid\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "buat detached signature"
@@@ -2370,11 -1873,9 +2396,11 @@@
msgid "make a clear text signature"
msgstr "|[file]|buat signature teks"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "buat detached signature"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "enkripsi data"
@@@ -2382,15 -1882,12 +2408,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifikasi signature"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "tampilkan kunci"
@@@ -2403,15 -1898,12 +2429,15 @@@ msgstr "tampilkan kunci dan signature
msgid "list and check key signatures"
msgstr "periksa signature kunci"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "buat sepasang kunci baru"
@@@ -2435,7 -1923,6 +2461,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "hapus kunci dari keyring publik"
@@@ -2467,7 -1948,6 +2493,7 @@@ msgstr "tandai kunci secara lokal
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "ubah passphrase"
@@@ -2517,24 -1986,19 +2543,24 @@@ msgstr "perbarui database trust
msgid "print message digests"
msgstr "|algo [file]|cetak digest pesan"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAMA|enkripsi untuk NAMA"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
@@@ -2548,12 -2010,10 +2574,12 @@@ msgstr "|N|set tingkat kompresi N (0 ti
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "jangan buat perubahan"
@@@ -2565,7 -2023,6 +2591,7 @@@ msgstr "tanya sebelum menimpa
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2573,7 -2030,6 +2599,7 @@@ msgstr "
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2593,13 -2049,11 +2619,13 @@@ msgstr "
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2614,7 -2068,6 +2640,7 @@@ msgstr "
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2622,604 -2075,475 +2648,604 @@@ msgstr "
"\n"
"Algoritma yang didukung:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Cipher: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Kompresi: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "pemakaian: gpg [pilihan] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, 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:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, 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:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "tampilkan keyring tempat kunci yang dipilih berada"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "tiadakan kunci"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "tidak dapat menset path exec ke %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "preferensi baku tidak valid\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "preferensi cipher personal tidak valid\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "preferensi digest personal tidak valid\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "preferensi kompresi personal tidak valid\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [namafile]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [namafile]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [namafile]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [namafile]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [namafile]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [namafile]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key id-user"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key id-user"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-user [perintah]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-user"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Pencarian keyserver gagal: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh keyserver gagal: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, 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:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[namafile]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@@ -3233,7 -2555,6 +3259,7 @@@ msgstr "mengambil kunci ini dari keyrin
msgid "make timestamp conflicts only a warning"
msgstr "buat timestamp konflik hanya sebagai peringatan"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|tulis info status ke FD ini"
@@@ -3260,326 -2577,260 +3286,326 @@@ msgstr "Tidak tersedia bantuan
msgid "No help available for '%s'"
msgstr "Tidak tersedia bantuan untuk `%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "perbarui database trust"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "perbarui database trust"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "kunci rahasia tidak dapat dipakai"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "melewati blok tipe %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kunci telah diproses\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Jumlah yang telah diproses: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " lewati kunci baru: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " lewati kunci baru: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " tanpa ID user: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " diimpor: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " tidak berubah: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID user baru: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subkey baru: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " signature baru: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " pembatalan kunci baru: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " kunci rahasia diimpor: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " kunci rahasia tidak berubah: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " tidak diimpor: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signature baru: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "melewati `%s': %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "kunci %08lX: tidak ada ID user yang valid\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "kunci %08lX: kunci baru - dilewati\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "kunci %08lX: \"%s\" tidak berubah\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "kunci %08lX: kunci rahasia diimpor\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3594,199 -2845,177 +3620,219 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "kunci %08lX: subkey binding tidak valid\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "kunci %08lX: hapus subkey binding ganda\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "kunci %08lX: melewati ID user "
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "kunci %08lX: melewati subkey\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
- #: g10/import.c:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "%s: keyring tercipta\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "%s: keyring tercipta\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[pembatalan]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[self-signature]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d signature yang buruk\n"
- msgstr[1] "%d signature yang buruk\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "%s signature, algoritma digest %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "Signature baik dari \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "melewati `%s': %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "User ID \"%s\" dibatalkan."
+ msgstr[1] "User ID \"%s\" dibatalkan."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3794,23 -3023,25 +3840,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signature tidak diperiksa karena tidak ada kunci\n"
msgstr[1] "1 signature tidak diperiksa karena tidak ada kunci\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 signature tidak diperiksa karena kesalahan\n"
- msgstr[1] "1 signature tidak diperiksa karena kesalahan\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d signature yang buruk\n"
+ msgstr[1] "%d signature yang buruk\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "terdeteksi ID %d user tanpa self-signature yang valid\n"
- msgstr[1] "terdeteksi ID %d user tanpa self-signature yang valid\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Signature baik dari \""
+ msgstr[1] "Signature baik dari \""
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3823,68 -3054,53 +3875,68 @@@ msgstr "
"memeriksa fingerprint dari berbagai sumber...)?\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Saya cukup percaya\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Saya sangat percaya\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr "..Tidak dapat menandai.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User ID \"%s\" kadaluwarsa."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User ID \"%s\" bukan self-signed."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "User ID \"%s\" bukan self-signed."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Ditandai? "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3893,11 -3109,9 +3945,11 @@@ msgstr "
"Self-signature pada \"%s\"\n"
"adalah signature bergaya PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3906,13 -3120,11 +3958,13 @@@ msgstr "
"Signature anda saat ini pada \"%s\"\n"
"telah habis berlaku.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3921,43 -3133,34 +3973,43 @@@ msgstr "
"Signature anda saat ini pada \"%s\"\n"
"adalah signature.lokal \n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Apakah anda ingin menandainya lagi? (y/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Kunci ini telah berakhir!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3967,32 -3170,26 +4019,32 @@@ msgstr "
"menandai benar benar milik\n"
"orang tersebut? Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Saya tidak akan menjawab.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Saya belum memeriksanya.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Saya telah melakukan pemeriksaan biasa.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4001,269 -3198,211 +4053,265 @@@ msgstr "
"Apakah anda yakin untuk menandai kunci ini \n"
"dengan kunci anda: "
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ini akan jadi self-signature.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, 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:1010
++#: g10/keyedit.c:1523
#, 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:1020
++#: g10/keyedit.c:1533
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat diekspor.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Saya belum memeriksa kunci ini sama sekali.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Saya telah memeriksa kunci ini.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
#, 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:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Ditandai? "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "memindahkan signature kunci ke tempat yang tepat\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "simpan dan berhenti"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Notasi signature: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "tampilkan kunci dan ID user"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "pilih ID user N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "pilih ID user N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "batalkan signature"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "tandai kunci secara lokal"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "tambah sebuah ID user"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "tambah sebuah photo ID"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "hapus ID user"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "hapus kunci sekunder"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "tambah kunci pembatalan"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
#, 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:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "tandai ID user sebagai primer"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "tampilkan preferensi (ahli)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "tampilkan preferensi (verbose)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "ubah passphrase"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "ubah ownertrust"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Benar-benar hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "batalkan sebuah ID user"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "batalkan kunci sekunder"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "aktifkan kunci"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "tiadakan kunci"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "tampilkan photo ID"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Kunci rahasia tersedia.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4271,267 -3410,215 +4319,273 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Kunci dibatalkan"
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Tandai ID seluruh user? "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Tandai ID seluruh user? "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "kelas signature tidak dikenal"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Hapus ID user ini? "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Anda ingin menghapus kunci terpilih ini? "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Anda ingin menghapus kunci ini? "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Benar-benar hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Benar-benar hapus ID user ini? "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Anda ingin membatalkan kunci ini? "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Anda ingin membatalkan kunci terpilih ini? "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Anda ingin membatalkan kunci ini? "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "set daftar preferensi"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Update preferensi?"
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Simpan perubahan? "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Berhenti tanpa menyimpan? "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "nilai yang tidak valid\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Tidak ada ID user tersebut.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Fitur: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Notasi: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
- #: g10/keyedit.c:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr " (sensitive)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "tidak dapat membuat %s: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revoked] "
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [berakhir: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [berakhir: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, fuzzy, c-format
msgid "usage: %s"
msgstr " trust: %c/%c"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " trust: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Kunci ini telah ditiadakan"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4539,19 -3626,14 +4593,19 @@@ msgstr "
"Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
"kecuali anda memulai kembali program.\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revoked] "
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4559,17 -3641,14 +4613,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4579,35 -3658,27 +4633,35 @@@ msgstr "
"dapat menyebabkan beberapa versi\n"
" PGP menolak kunci ini.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Anda tetap ingin menambahkannya? (y/n) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Hapus signature baik ini? (y/T/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Hapus signature tidak valid ini? (y/T/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4615,38 -3686,31 +4669,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Menghapus %d signature.\n"
msgstr[1] "Menghapus %d signature.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Tidak ada yang dihapus.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
#, fuzzy
msgid "invalid"
msgstr "armor tidak valid"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "User ID \"%s\" dibatalkan."
msgstr[1] "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4656,44 -3720,36 +4710,44 @@@ msgstr "
"designated dapat\n"
"............menyebabkan beberapa versi PGP menolak kunci ini.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
#, 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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
#, 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:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4701,234 -3757,184 +4755,234 @@@
msgstr ""
"Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Merubah batas waktu untuk kunci sekunder.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Merubah batas waktu untuk kunci primer.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Notasi signature: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ditimpa (y/T)? "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID user: "
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (tidak dapat diekspor)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Anda tetap ingin membatalkannya? (y/n) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
#, fuzzy
msgid "Not signed by you.\n"
msgstr " ditandai oleh %08lX pada %s%s\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr " (tidak dapat diekspor)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " dibatalkan oleh %08lX pada %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Anda akan membatalkan signature ini:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "tidak ada kunci rahasia\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "preferensi %c%lu ganda \n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "terlalu banyak preferensi `%c'\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "terlalu banyak preferensi `%c'\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "terlalu banyak preferensi `%c'\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "menulis signature direct\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "menulis self signature\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "menulis key binding signature\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize tidak valid; menggunakan %u bit\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize dibulatkan hingga %u bit\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "tandai"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "enkripsi data"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -4942,157 -3948,126 +4996,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (hanya enkripsi)\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA dan ElGamal (baku)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA dan ElGamal (baku)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (hanya menandai)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (hanya menandai)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (hanya enkripsi)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA dan ElGamal (baku)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (hanya menandai)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notasi signature: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Keysize yang diminta adalah %u bit\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5108,7 -4083,6 +5162,7 @@@ msgstr "
" <n>m = kunci berakhir dalam n bulan\n"
" <n>y = kunci berakhir dalam n tahun\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5124,40 -4098,32 +5178,40 @@@ msgstr "
" <n>m = signature berakhir dalam n bulan\n"
" <n>y = signature berakhir dalam n tahun\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Kunci valid untuk? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Signature valid untuk? (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "nilai yang tidak valid\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s tidak pernah berakhir\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s tidak pernah berakhir\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s berakhir pada %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Signature kadaluarsa pada %s \n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5165,12 -4131,10 +5219,12 @@@ msgstr "
"Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
"Namun, ia dapat menanganinya secara benar hingga 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Benar (y/t)? "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5181,7 -4145,6 +5235,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5197,50 -4160,39 +5251,50 @@@ msgstr "
"user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Nama sebenarnya: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Karakter tidak valid dalam nama\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Nama tidak boleh dimulai dengan digit\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Nama harus berukuran minimum 5 karakter\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Alamat email: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Bukan alamat email yang valid\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Komentar: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Karakter tidak valid dalam komentar\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5250,7 -4202,6 +5304,7 @@@ msgstr "
"Anda memilih USER-ID ini:\n"
" \"%s\"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5265,35 -4216,28 +5319,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoQq"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Silakan perbaiki kesalahan ini dulu\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5305,12 -4249,10 +5359,12 @@@ msgstr "
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5318,68 -4260,55 +5372,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' sudah dikompresi\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Tetap dibuat? "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Tetap dibuat? "
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5389,65 -4318,52 +5443,65 @@@ msgstr "
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, 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:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, 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:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
- #: g10/keygen.c:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ingin diciptakan? "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "tidak pernah..."
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Kebijakan signature kritis: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Kebijakan signature: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Notasi signature kritis: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Notasi signature: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5455,69 -4371,63 +5509,77 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d signature yang buruk\n"
msgstr[1] "%d signature yang buruk\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 signature tidak diperiksa karena kesalahan\n"
+ msgstr[1] "1 signature tidak diperiksa karena kesalahan\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Keyring"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "melewati `%s': %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Fingerprint kunci primer:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Fingerprint kunci primer ="
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint kunci ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "memeriksa keyring `%s'\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu kunci telah diperiksa (%lu signature)\n"
msgstr[1] "%lu kunci telah diperiksa (%lu signature)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5525,523 -4435,416 +5587,523 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 signature yang buruk\n"
msgstr[1] "1 signature yang buruk\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: keyring tercipta\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "meminta kunci %08lX dari %s\n"
msgstr[1] "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"ditandai dengan kunci anda %08lX pada %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s kunci sesi enkripsi\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "kunci publik adalah %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "gagal dekripsi kunci publik: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "dienkripsi dengan passphrase %lu\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "dienkripsi dengan 1 passphrase\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "asumsikan %s data terenkripsi\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "dekripsi lancar\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "original file name='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "Signature baik dari \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "signature BURUK dari \""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature kadaluarsa dari \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signature baik dari \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "verifikasi signature tidak diabaikan\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "tidak dapat menangani banyak signature ini\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Kunci tersedia di:"
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[uncertain]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Signature kadaluarsa pada %s \n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "biner"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "modeteks"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "tidak dikenal"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritma pubkey tidak dikenal"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Tidak dapat memeriksa signature: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "bukan detached signature\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "kelas signature mandiri 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "signature model lama (PGP 2.X)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "tidak dapat membuka file: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "tidak dapat menangani algoritma kunci publik %d\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "algoritma cipher belum diimplementasikan"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "kesalahan pembacaan: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "kesalahan pembacaan: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "silakan gunakan \"%s%s\"\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Tidak dikompresi"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "Tidak dikompresi"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "membaca pilihan dari `%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "kelas signature tidak dikenal"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "File `%s' ada. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Ditimpa (y/T)? "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: suffix tidak dikenal\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Masukkan nama file baru"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "menulis ke stdout\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "mengasumsikan data bertanda dalam `%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "file konfigurasi baru `%s' tercipta\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "tidak dapat menangani algoritma kunci publik %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaket tipe %d memiliki bit kritis terset\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID kunci utama %08lX)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6054,15 -4857,12 +6116,15 @@@ msgstr "
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, tercipta %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Masukkan passphrase\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "dibatalkan oleh user\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6072,47 -4872,38 +6134,47 @@@ msgstr "
"Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
"pemakai: \""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Anda ingin menghapus kunci terpilih ini? "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Anda ingin menghapus kunci terpilih ini? "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6170,31 -4953,24 +6232,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Tidak ada alasan diberikan"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Kunci dilampaui"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Kunci ini telah dikompromikan"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Kunci tidak lagi digunakan"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "ID User tidak lagi valid"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "Alasan pembatalan:"
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "Komentar pembatalan:"
@@@ -6208,100 -4984,81 +6270,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Tidak ada nilai trust untuk:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " alias \""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, 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:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Tidak tahu\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d: Saya TIDAK percaya\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Saya sangat percaya sekali\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = kembali ke menu utama\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = lewati kunci ini\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " q = berhenti\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Keputusan anda? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, 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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Sertifikat mengarahkan ke kunci terpercaya:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Kunci ini mungkin milik pemiliknya\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Kunci ini milik kita\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6313,131 -5070,103 +6375,131 @@@ msgstr "
"pertanyaan berikut dengan ya\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Tetap gunakan kunci ini? "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Hal ini dapat berarti bahwa signature adalah palsu.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Catatan: Kunci ini telah ditiadakan\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Catatan: Kunci ini telah berakhir!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Tidak ada indikasi signature milik pemilik.\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Signature mungkin palsu.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Tidak pasti signature milik pemilik.\n"
- #: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: dilewati: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: dilewati: kunci publik dimatikan\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: dilewati: kunci publik telah ada\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "tidak dapat terkoneksi ke `%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6445,167 -5174,131 +6507,167 @@@ msgstr "
"\n"
"Masukkan user ID. Akhiri dengan baris kosong: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Tidak ada ID user tersebut.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Kunci publik dimatikan.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "dilewati: kunci publik telah diset\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "tidak ada alamat yang valid\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Menghapus signature.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Silakan masukkan nama file data: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "membaca stdin ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "tidak ada data tertandai\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "tidak dapat membuka data tertandai `%s'\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "baik, kita adalah penerima anonim.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "encoding lama DEK tidak didukung\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "algoritma cipher %d%s tidak dikenal atau ditiadakan\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet gagal: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Akan dibatalkan oleh:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Ini adalah kunci pembatalan sensitif)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "Kunci rahasia tersedia.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Buat sertifikat pembatalan untuk kunci ini?"
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "Pemaksaan output mode ASCII.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "gagal make_keysig_packet: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Sertifikat pembatalan tercipta.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, fuzzy, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Buat sertifikat pembatalan untuk kunci ini?"
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6614,20 -5307,17 +6676,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Sertifikat pembatalan tercipta.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
@@@ -6635,23 -5325,19 +6697,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Buat sertifikat pembatalan untuk kunci ini?"
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6671,94 -5357,76 +6733,94 @@@ msgstr "
"pencetakan\n"
"mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Silakan pilih alasan untuk pembatalan:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Batal"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Mungkin anda ingin memilih %d di sini)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Alasan pembatalan: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Tidak diberikan deskripsi)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Ini oke? "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "kunci lemah tercipta - mengulang\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "Peringatan: konflik digest signature dalam pesan\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = beri saya informasi lebih banyak lagi\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
msgstr[1] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
msgstr[1] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6769,7 -5437,6 +6831,7 @@@ msgstr[0] "
msgstr[1] ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6779,41 -5446,34 +6841,41 @@@ msgstr[0] "
msgstr[1] ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "CATATAN: kunci telah dibatalkan"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"PERINGATAN: tidak dapat melakukan %%-expand notasi (terlalu besar). "
"Menggunakan yang tidak di-expand.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6821,7 -5481,6 +6883,7 @@@ msgstr "
"PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar). "
"Menggunakan yang tidak expand.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6830,54 -5489,44 +6892,54 @@@ msgstr "
"PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar). "
"Menggunakan yang tidak expand.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s signature dari: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "menandai:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s enkripsi akan digunakan\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
"palsu!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "lewati `%s': terduplikasi\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6886,340 -5535,274 +6948,340 @@@ 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
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "baris terlalu panjang\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr "impor nilai ownertrust"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "kesalahan: gagal menemukan catatan trust: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "kesalahan pembacaan: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: gagal sync: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "tidak dapat membuka `%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek gagal: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, 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
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "transaksi trustdb terlalu besar\n"
- #: 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"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: direktori tidak ada!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, fuzzy, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "tidak dapat menutup `%s': %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: gagal membuat catatan versi: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: tercipta trustdb tidak valid\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: tercipta trustdb\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb tidak valid\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: kesalahan memperbaharui catatan versi: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: kesalahan membaca catatan versi: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: kesalahan menulis catatan versi: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek gagal: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: bukan file trustdb\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: catatan versi dengan recnum %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versi file %d tidak valid\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: kesalahan membaca record bebas: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: kesalahan menulis dir record: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: gagal mengosongkan record: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: gagal menambahkan record: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: tercipta trustdb\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "baris input lebih dari %d karakter\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritma yang didukung:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: kesalahan menulis dir record: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "kunci publik %08lX tidak ditemukan: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Kebijakan: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "tampilkan kunci"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [file]|cetak digest pesan"
msgstr[1] "|algo [file]|cetak digest pesan"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7229,173 -5812,153 +7291,184 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [file]|cetak digest pesan"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "kunci ditandai sebagai sangat dipercaya.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7404,7 -5966,6 +7477,7 @@@
msgid "no need for a trustdb check\n"
msgstr "tidak perlu memeriksa trustdb\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "pemeriksaan trustdb berikutnya pada %s\n"
@@@ -7451,35 -6004,28 +7524,35 @@@ msgstr "tidak ditemukan kunci yang bena
msgid "public key of ultimately trusted key %s not found\n"
msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
#, fuzzy
msgid "never"
msgstr "tidak pernah..."
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7491,42 -6037,33 +7564,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "[revoked] "
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "[expired] "
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "tidak dikenal"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7536,12 -6073,10 +7609,12 @@@ msgstr "
"Tolong ingat bahwa file signature (.sig atau .asc)\n"
"haruslah file pertama yang diberikan pada perintah baris.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "baris input %u terlalu panjang atau hilang LF\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
@@@ -7870,7 -6337,6 +7943,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8015,9 -6451,6 +8088,9 @@@ msgstr "kesalahan penciptaan passphrase
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
@@@ -8526,7 -6854,6 +8599,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "gagal membaca keyblock: %s\n"
@@@ -8551,134 -6874,104 +8624,134 @@@ msgstr "gagal menghapus keyblok: %s\n
msgid "no valid recipients given\n"
msgstr "(Tidak diberikan deskripsi)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "tampilkan kunci rahasia"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "sertifikat yang buruk"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "sertifikat yang buruk"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "sertifikat yang buruk"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "ciptakan output ascii"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "jangan menggunakan terminal"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "mode batch: tanpa tanya"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "asumsikan ya untuk seluruh pertanyaan"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "asumsikan tidak untuk seluruh pertanyaan"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "tambah keyring ini ke daftar keyring"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMA|gunakan algoritma cipher NAMA"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8689,47 -6982,38 +8762,47 @@@ msgstr "
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "tidak dapat terkoneksi ke `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Tidak diberikan deskripsi)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = lewati kunci ini\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "menulis ke `%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8747,7 -7028,6 +8820,7 @@@ msgstr "buat sertifikat revokasi
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -8762,32 -7040,26 +8835,32 @@@ msgstr "kesalahan penciptaan passphrase
msgid "error reading input: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? masalah memeriksa pembatalan: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -8966,7 -7205,6 +9039,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "Sertifikat pembatalan tercipta.\n"
@@@ -8976,8 -7213,6 +9049,8 @@@
msgid "certificate cached\n"
msgstr "preferensi %c%lu ganda \n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -9584,13 -7696,11 +9657,13 @@@ msgstr "sertifikat yang buruk
msgid "force the use of the default OCSP responder"
msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9598,85 -7708,69 +9671,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "preferensi %c%lu ganda \n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "CATATAN: kunci telah dibatalkan"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritma yang didukung:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9831,12 -7891,10 +9904,12 @@@ msgstr "pemakaian: gpg [pilihan]
msgid "colons are not allowed in the socket name\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
@@@ -10331,77 -8287,61 +10404,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
- #: dirmngr/server.c:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/it.po
index a6560e7,6b30fbd..fd74b8a
--- a/po/it.po
+++ b/po/it.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.1.92\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2008-05-26 12:02+0200\n"
"Last-Translator: Marco d'Itri <md at linux.it>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@@ -98,8 -82,6 +98,8 @@@ msgstr "Inserisci la passphrase, cio� u
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "passphrase errata"
@@@ -155,25 -126,11 +155,25 @@@ msgstr "passphrase errata
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -382,8 -300,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "cambia la passphrase"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,118 -309,87 +393,118 @@@ msgstr "
"Opzioni:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "prolisso"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "meno prolisso"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca delle chiavi su un key server"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aggiorna il database della fiducia"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NOME|imposta NOME come set di caratteri del terminale"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "non gestito"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -513,164 -398,124 +513,169 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directory creata\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+
++#: agent/gpg-agent.c:1964
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: impossibile creare la directory: %s\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: saltata: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -686,8 -529,6 +691,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -695,9 -536,6 +700,9 @@@ msgstr "
"@Comandi:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -707,46 -545,38 +712,46 @@@ msgstr "
"Opzioni:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "Cancella"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
@@@ -810,8 -630,6 +815,8 @@@ msgstr "
msgid "Yes"
msgstr "si|s�"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -841,46 -656,38 +846,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "cambia la passphrase"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "abilita una chiave"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -921,53 -721,42 +926,57 @@@ msgstr "l'algoritmo di protezione %d%s
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "l'algoritmo di protezione %d%s non � gestito\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "errore leggendo `%s': %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "aggiornamento fallito: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "errore leggendo `%s': %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "errore leggendo `%s': %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "errore leggendo `%s': %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -982,17 -769,18 +991,22 @@@ msgstr "problema di comunicazione con g
msgid "problem setting the gpg-agent options\n"
msgstr "problema con l'agent: ha restituito 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "interrotto dall'utente\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "problema con l'agent: ha restituito 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problema con l'agent: ha restituito 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "impossibile disabilitare i core dump: %s\n"
@@@ -1063,17 -837,18 +1077,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, fuzzy, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "errore creando il portachiavi `%s': %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1403,7 -1111,6 +1422,7 @@@ msgid "command \"%.50s\" is ambiguous\n
msgstr ""
# ??? (Md)
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "non esaminato"
@@@ -1413,22 -1119,14 +1432,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "opzioni di importazione non valide\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "hai trovato un bug... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "impossibile aprire il file: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
@@@ -1467,89 -1158,75 +1481,95 @@@ msgstr "chiave pubblica %08lX non trova
msgid "waiting for lock %s...\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "armatura: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "header dell'armatura non valido: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "header dell'armatura: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "header della firma in chiaro non valido\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "header dell'armatura: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "firme in chiaro annidate\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "armatura inaspettata:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "riga protetta con il trattino non valida: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "Carattere radix64 non valido %02x saltato\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "eof prematura (nessun CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "eof prematura (nel CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "CRC malformato\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "errore nel CRC; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "eof prematura (nella coda)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "errore nella riga della coda\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"carattere quoted printable nell'armatura - probabilmente � stato usato\n"
"un MTA buggato\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "non leggibile"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1557,84 -1234,73 +1577,95 @@@ msgstr "
"il nome di una nota deve essere formato solo da caratteri stampabili o\n"
"spazi e terminare con un '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "il valore di una nota non deve usare caratteri di controllo\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
+ "spazi e terminare con un '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "non leggibile"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Inserisci la passphrase: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossibile fare questo in modo batch\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Questo comando non � permesso in modalit� %s.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Cosa scegli? "
@@@ -1702,21 -1354,11 +1733,16 @@@ msgstr "non c'� una chiave pubblica cor
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
@@@ -1814,13 -1437,10 +1840,13 @@@ msgstr "Di che dimensioni vuoi la chiav
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1875,9 -1485,6 +1901,9 @@@ msgstr " (%d) RSA (cifra solo)\n
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Scelta non valida.\n"
@@@ -1911,7 -1512,6 +1937,7 @@@ msgstr "Firmo davvero?
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "abbandona questo men�"
@@@ -1920,7 -1519,6 +1946,7 @@@
msgid "show admin commands"
msgstr "comandi in conflitto\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "mostra questo aiuto"
@@@ -2004,126 -1584,97 +2030,126 @@@ msgstr "comandi in conflitto\n
msgid "Admin commands are not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output non funziona con questo comando\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "impossibile aprire `%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "errore leggendo il keyblock: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/delkey.c:130 g10/delkey.c:137
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(a meno che la chiave sia specificata con il fingerprint)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
#, 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:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Vuoi cancellare questa chiave dal portachiavi? "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "� una chiave segreta! - Vuoi cancellarla davvero? "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "key"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "A chiave pubblica: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "informazioni di fiducia del possessore cancellate\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
"impossibile usare un pacchetto ESK simmetrico a causa della modalit� S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "uso il cifrario %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' � gi� compresso\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ATTENZIONE: `%s' � un file vuoto\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "lettura da `%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2131,7 -1682,6 +2157,7 @@@ msgstr "
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2140,41 -1690,34 +2166,41 @@@ msgstr "
"forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "non � possibile usare %s in modalit� %s\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrato per: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "non � possibile usare %s in modalit� %s\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "dati cifrati con %s\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrato con l'algoritmo sconosciuto %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
"per il cifrario simmetrico\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problema nella gestione del pacchetto cifrato\n"
@@@ -2236,138 -1768,110 +2262,138 @@@ 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:79
++#: g10/export.c:78
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"La firma sar� marcata come irrevocabile.\n"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "non sono state trovate chiavi di revoca per `%s'\n"
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "chiave segreta inutilizzabile"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: saltata: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "ATTENZIONE: non � stato esportato nulla\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[User ID non trovato]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "chiave segreta `%s' non trovata: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "fai una firma separata"
@@@ -2377,11 -1880,9 +2403,11 @@@
msgid "make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifra dati"
@@@ -2389,15 -1889,12 +2415,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "elenca le chiavi"
@@@ -2410,15 -1905,12 +2436,15 @@@ msgstr "elenca le chiavi e le firme
msgid "list and check key signatures"
msgstr "controlla le firme delle chiavi"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
@@@ -2442,7 -1930,6 +2468,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "rimuove le chiavi dal portachiavi pubblico"
@@@ -2474,7 -1955,6 +2500,7 @@@ msgstr "firma una chiave localmente
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "cambia la passphrase"
@@@ -2524,24 -1993,19 +2550,24 @@@ msgstr "aggiorna il database della fidu
msgid "print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifra per NOME"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
@@@ -2555,12 -2017,10 +2581,12 @@@ msgstr "|N|imposta il livello di compre
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "non fa cambiamenti"
@@@ -2572,7 -2030,6 +2598,7 @@@ msgstr "chiede prima di sovrascrivere
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2580,7 -2037,6 +2606,7 @@@ msgstr "
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2600,13 -2056,11 +2626,13 @@@ msgstr "
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2621,7 -2075,6 +2647,7 @@@ msgstr "
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2629,603 -2082,474 +2655,603 @@@ msgstr "
"\n"
"Algoritmi gestiti:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "A chiave pubblica: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Cifrari: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Compressione: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opzioni] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, 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:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, 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:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "disabilita una chiave"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossibile impostare exec-path a %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non � permesso usare %s con %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "preferenze predefinite non valide\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "preferenze personali del cifrario non valide\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "preferenze personali del digest non valide\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "preferenze personali di compressione non valide\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [nomefile]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifratura fallita: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nomefile]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [comandi]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ricerca nel keyserver fallita: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aggiornamento del keyserver fallito: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, 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:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[nomefile]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL della politica di certificazione indicato non � valido\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
@@@ -3239,7 -2561,6 +3265,7 @@@ msgstr "prende le chiavi da questo port
msgid "make timestamp conflicts only a warning"
msgstr "segnala i conflitti di data solo con un avvertimento"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato sul FD"
@@@ -3266,326 -2583,260 +3292,326 @@@ msgstr "Non � disponibile un aiuto
msgid "No help available for '%s'"
msgstr "Non � disponibile un aiuto per `%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aggiorna il database della fiducia"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aggiorna il database della fiducia"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chiave segreta inutilizzabile"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "salto un blocco di tipo %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "Per ora sono state esaminate %lu chiavi\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Numero totale esaminato: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " nuove chiavi saltate: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nuove chiavi saltate: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " senza user ID: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " non modificate: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuovi user ID: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuove subchiavi: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuove firme: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nuove revoche di chiavi: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chiavi segrete importate: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chiavi segrete non cambiate: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " importate: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nuove firme: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "saltata `%s': %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chiave %08lX: nessun user ID valido\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "questo pu� essere causato da una autofirma mancante\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chiave %08lX: nuova chiave - saltata\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chiave %08lX: \"%s\" una nuova firma\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chiave %08lX: \"%s\" non cambiata\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chiave %08lX: chiave segreta importata\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "chiave segreta `%s' non trovata: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3600,202 -2851,180 +3626,222 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chiave %08lX: legame con la subchiave non valido:\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chiave %08lX: revoca della subchiave non valida\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chiave %08lX: saltato l'user ID '"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chiave %08lX: saltata la subchiave\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "portachiavi `%s' creato\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "portachiavi `%s' creato\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "rebuild della cache del portachiavi fallito: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revoca]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[autofirma]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d firme non corrette\n"
- msgstr[1] "%d firme non corrette\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "Firma %s, algoritmo di digest %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "Firma valida da \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "saltata `%s': %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "L'user ID \"%s\" � stato revocato."
+ msgstr[1] "L'user ID \"%s\" � stato revocato."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3803,23 -3032,25 +3849,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "una firma non controllata per mancanza della chiave\n"
msgstr[1] "una firma non controllata per mancanza della chiave\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "una firma non controllata a causa di un errore\n"
- msgstr[1] "una firma non controllata a causa di un errore\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d firme non corrette\n"
+ msgstr[1] "%d firme non corrette\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "Trovati %d user ID senza autofirme valide\n"
- msgstr[1] "Trovati %d user ID senza autofirme valide\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Firma valida da \""
+ msgstr[1] "Firma valida da \""
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3832,68 -3063,53 +3884,68 @@@ msgstr "
"impronte digitali da diverse fonti...)?\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Mi fido marginalmente\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Mi fido completamente\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'user ID \"%s\" � stato revocato."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Impossibile firmarla.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'user ID \"%s\" � scaduto."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'user ID \"%s\" non � autofirmato."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'user ID \"%s\" non � autofirmato."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Firmo davvero? "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3902,11 -3118,9 +3954,11 @@@ msgstr "
"L'autofirma su \"%s\"\n"
"� una firma in stile PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3915,11 -3129,9 +3967,11 @@@ msgstr "
"La tua firma attuale su \"%s\"\n"
"� scaduta\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3928,43 -3140,34 +3980,43 @@@ msgstr "
"La tua firma attuale su \"%s\"\n"
"� una firma locale.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, 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:833
++#: g10/keyedit.c:1346
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:855
++#: g10/keyedit.c:1368
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Niente da firmare con la chiave %08lX\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Questa chiave � scaduta!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Questa chiave scadr� il %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3974,32 -3177,26 +4026,32 @@@ msgstr "
"appartiene veramente alla persona indicata sopra?\n"
"Se non sai cosa rispondere digita \"0\".\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Preferisco non rispondere.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, 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:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) L'ho controllata superficialmente.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) L'ho controllata molto attentamente.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4008,269 -3205,211 +4060,265 @@@ msgstr "
"Sei davvero sicuro di volere firmare questa chiave\n"
"con la tua chiave: \""
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Questa sar� una autofirma.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, 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:1010
++#: g10/keyedit.c:1523
#, 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:1020
++#: g10/keyedit.c:1533
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La firma sar� marcata come non esportabile.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La firma sar� marcata come irrevocabile.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Non ho controllato per niente questa chiave.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Ho controllato questa chiave superficialmente.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Ho controllato questa chiave molto attentamente.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Firmo davvero? "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "spostamento della firma di una chiave nel posto corretto\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "salva ed esci"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Annotazione della firma: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "elenca le chiavi e gli user ID"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "scegli l'user ID N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "scegli l'user ID N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "revoca firme"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "firma la chiave localmente"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "aggiungi un user ID"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "aggiungi un ID fotografico"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "cancella un user ID"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "cancella una chiave secondaria"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "aggiungi una chiave di revoca"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
#, 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:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "imposta l'user ID come primario"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "elenca le preferenze (per esperti)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "elenca le preferenze (prolisso)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
#, 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:1443
++#: g10/keyedit.c:1909
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "cambia la passphrase"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "cambia il valore di fiducia"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Revoco davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revoca un user ID"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoca una chiave secondaria"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "abilita una chiave"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "disabilita una chiave"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostra l'ID fotografico"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "� disponibile una chiave segreta.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Per fare questo serve la chiave segreta.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4278,267 -3417,215 +4326,273 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "La chiave � stata revocata."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Firmo davvero tutti gli user ID? "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Firmo davvero tutti gli user ID? "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "classe della firma sconosciuta"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Devi selezionare almeno un user ID.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Tolgo davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Tolgo davvero questo user ID? "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vuoi davvero cancellare questa chiave? "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Revoco davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Revoco davvero questo user ID? "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Vuoi davvero revocare questa chiave? "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Vuoi davvero revocare le chiavi selezionate? "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vuoi davvero revocare questa chiave? "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "imposta la lista di preferenze"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, 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:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Aggiorno davvero le preferenze? "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Salvo i cambiamenti? "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Esco senza salvare? "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "errore: impronta digitale non valida\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "valore non valido\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "User ID inesistente.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Niente da firmare con la chiave %08lX\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Caratteristiche: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Nota: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr " (sensibile)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "impossibile creare %s: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocata]"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr "[scadenza: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr "[scadenza: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, fuzzy, c-format
msgid "usage: %s"
msgstr " fiducia: %c/%c"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " fiducia: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Questa chiave � stata disabilitata"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4547,19 -3634,14 +4601,19 @@@ msgstr "
"corretta\n"
"finch� non eseguirai di nuovo il programma.\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revocata]"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4568,17 -3650,14 +4622,17 @@@ msgstr "
" potrebbe fare diventare un altro user ID il primario "
"predefinito.\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4587,36 -3666,28 +4641,36 @@@ msgstr "
"ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
" pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Cancellare questa firma corretta? (s/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Cancellare questa firma non valida? (s/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Cancellare davvero questa autofirma? (s/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4624,38 -3695,31 +4678,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Cancellata %d firma.\n"
msgstr[1] "Cancellata %d firma.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Non � stato cancellato nulla.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
#, fuzzy
msgid "invalid"
msgstr "armatura non valida"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "L'user ID \"%s\" � stato revocato."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "L'user ID \"%s\" � stato revocato."
msgstr[1] "L'user ID \"%s\" � stato revocato."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4665,46 -3729,38 +4719,46 @@@ msgstr "
" designato pu� causarne il rifiuto da parte di alcune versioni\n"
" di PGP.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Inserisci l'user ID del revocatore designato: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
#, 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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
#, 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:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4712,238 -3768,188 +4766,238 @@@
msgstr ""
"Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambio la data di scadenza per la chiave primaria.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Devi selezionare esattamente un user ID.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Annotazione della firma: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Sovrascrivo (s/N)? "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "user ID: \""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (non esportabile)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Questa chiave � scaduta il %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Creare un certificato di revoca per questa firma? (s/N) "
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
#, fuzzy
msgid "Not signed by you.\n"
msgstr " firmata da %08lX il %s%s\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr " (non esportabile)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocata da %08lX il %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Stai per revocare queste firme:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Creare davvero i certificati di revoca? (s/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "manca la chiave segreta\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "la preferenza %c%lu � doppia\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "ci sono troppe preferenze `%c'\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "ci sono troppe preferenze `%c'\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "ci sono troppe preferenze `%c'\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "scrittura della firma diretta\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "scrittura della autofirma\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "scrittura della firma di collegamento alla chiave\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "dimensione della chiave non valida; uso %u bit\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dimensioni della chiave arrotondate a %u bit\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "cifra dati"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -4957,157 -3963,126 +5011,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (cifra solo)\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA e ElGamal (default)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA e ElGamal (default)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (firma solo)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (firma solo)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (cifra solo)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA e ElGamal (default)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (firma solo)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Annotazione della firma: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La dimensione richiesta della chiave � %u bit\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "arrotondate a %u bit\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5123,7 -4098,6 +5177,7 @@@ msgstr "
" <n>m = la chiave scadr� dopo n mesi\n"
" <n>y = la chiave scadr� dopo n anni\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5139,40 -4113,32 +5193,40 @@@ msgstr "
" <n>m = la chiave scadr� dopo n mesi\n"
" <n>y = la chiave scadr� dopo n anni\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Chiave valida per? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Firma valida per? (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "valore non valido\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s non ha scadenza\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s non ha scadenza\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s scadr� il %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Questa firma scadr� il %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5180,12 -4146,10 +5234,12 @@@ msgstr "
"Il tuo sistema non pu� mostrare date oltre il 2038.\n"
"Comunque, sar� gestita correttamente fino al 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "� giusto (s/n)? "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5196,7 -4160,6 +5250,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5213,50 -4176,39 +5267,50 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Nome e Cognome: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Carattere non valido nel nome\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Il nome non pu� iniziare con una cifra\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Indirizzo di Email: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "L'indirizzo di email non � valido\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Commento: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Carattere non valido nel commento\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5267,7 -4219,6 +5321,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5282,35 -4233,28 +5336,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Per favore correggi prima l'errore\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5322,12 -4266,10 +5376,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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5335,66 -4277,53 +5389,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' � gi� compresso\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Uso lo stesso questa chiave? "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
msgid "creating anyway\n"
msgstr "genera una nuova coppia di chiavi"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: chiave %08lX scaduta il %s\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5404,7 -4333,6 +5458,7 @@@ msgstr "
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5412,7 -4340,6 +5466,7 @@@ msgstr "
"la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5420,51 -4347,40 +5474,51 @@@ msgstr "
"la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
- #: g10/keygen.c:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crea davvero? "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "mai "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Politica critica di firma: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Politica di firma: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Annotazione critica della firma: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Annotazione della firma: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5472,69 -4388,63 +5526,77 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d firme non corrette\n"
msgstr[1] "%d firme non corrette\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "una firma non controllata a causa di un errore\n"
+ msgstr[1] "una firma non controllata a causa di un errore\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Portachiavi"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "saltata `%s': %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Impronta digitale della chiave primaria:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Impronta digitale della chiave primaria:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impronta digitale ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "controllo il portachiavi `%s'\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "Sono state controllate %lu chiavi (%lu firme)\n"
msgstr[1] "Sono state controllate %lu chiavi (%lu firme)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5542,101 -4452,80 +5604,101 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "una firma non corretta\n"
msgstr[1] "una firma non corretta\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: portachiavi creato\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, 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:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "richiedo la chiave %08lX a %s\n"
msgstr[1] "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
@@@ -5644,393 -4533,313 +5706,393 @@@
"firmata con la tua chiave %08lX il %s\n"
"\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "chiave di sessione cifrata con %s\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "cifrato con l'algoritmo sconosciuto %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "la chiave pubblica � %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "Cifrato con la chiave %s con ID %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decifratura della chiave pubblica fallita: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifratto con %lu passphrase\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "cifratto con 1 passphrase\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "suppongo che i dati siano cifrati con %s\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "decifratura corretta\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifratura fallita: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome del file originale='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "Firma valida da \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma NON corretta da \""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma scaduta da \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Firma valida da \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "verifica della firma soppressa\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "impossibile gestire queste firme multiple\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Firma scaduta il %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Chiave disponibile presso: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[incerta]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma scaduta il %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Questa firma scadr� il %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binario"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "modo testo"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "sconosciuto"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo della chiave pubblica sconosciuto"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossibile controllare la firma: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "non � una firma separata\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma solitaria di classe 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "firma vecchio stile (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "impossibile aprire il file: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, fuzzy, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
#, 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:302
++#: g10/misc.c:300
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "algoritmo di cifratura non implementato"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, 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:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "errore di lettura: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "errore di lettura: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d \"%s\" � una opzione deprecata\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "usa al suo posto \"%s%s\"\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Non compresso"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "Non compresso"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "classe della firma sconosciuta"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Il file `%s' esiste. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Sovrascrivo (s/N)? "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: suffisso sconosciuto\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Inserire il nuovo nome del file"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "scrivo su stdout\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "suppongo che i dati firmati siano in `%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "creato un nuovo file di configurazione `%s'\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
@@@ -6038,33 -4847,27 +6100,33 @@@ msgstr "
"ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
"esecuzione del programma\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
"non sicura\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problema con l'agent: ha restituito 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (key ID principale %08lX)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6077,15 -4880,12 +6139,15 @@@ msgstr "
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Inserisci la passphrase\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "interrotto dall'utente\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6095,47 -4895,38 +6157,47 @@@ msgstr "
"Ti serve una passphrase per sbloccare la chiave segreta\n"
"dell'utente: \""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Inserisci la passphrase, cio� una frase segreta \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6194,31 -4977,24 +6256,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Nessuna ragione specificata"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Questa chiave � stata sostituita"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Questa chiave � stata compromessa"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "La chiave non � pi� usata"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "L'user ID non � pi� valido"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "ragione della revoca: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "commento alla revoca: "
@@@ -6232,100 -5008,81 +6294,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Nessun valore di fiducia assegnato a:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " alias \""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, 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:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Non lo so\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NON mi fido\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Mi fido definitivamente\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = torna al men� principale\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = salta questa chiave\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " q = abbandona\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Cosa hai deciso? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, 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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Questa chiave probabilmente appartiene al proprietario\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Questa chiave ci appartiene\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6337,133 -5094,105 +6399,133 @@@ msgstr "
"rispondere s� alla prossima domanda.\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Uso lo stesso questa chiave? "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Questo pu� significare che la firma � stata falsificata.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Nota: questa chiave � stata disabilitata.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Nota: questa chiave � scaduta!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma � probabilmente un FALSO.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: saltata: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: saltata: chiave pubblica disabilitata\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: saltata: chiave pubblica gi� presente\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "impossibile connettersi a `%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6471,169 -5200,133 +6533,169 @@@ msgstr "
"\n"
"Inserisci l'user ID. Termina con una riga vuota: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "User ID inesistente.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "La chiave pubblica � disabilitata.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "saltata: chiave pubblica gi� impostata\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "nessun indirizzo valido\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Firma separata.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Inserisci il nome del file di dati: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "viene letto stdin...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "non ci sono dati firmati\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "impossibile aprire i dati firmati `%s'\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "bene, siamo il destinatario anonimo.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "la vecchia codifica del DEK non � gestita\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "l'algoritmo di cifratura %d%s � sconosciuto o disattivato\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTA: chiave %08lX scaduta il %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet fallito: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Revocabile da:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Questa � una chiave di revoca sensibile)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "� disponibile una chiave segreta.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Creare un certificato di revoca per questa chiave? "
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "Forzato l'output con armatura ASCII.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet fallito: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Certificato di revoca creato.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, 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:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Creare un certificato di revoca per questa chiave? "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6642,20 -5335,17 +6704,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Certificato di revoca creato.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "chiave segreta `%s' non trovata: %s\n"
@@@ -6663,23 -5353,19 +6725,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Creare un certificato di revoca per questa chiave? "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6699,96 -5385,78 +6761,96 @@@ msgstr "
"disponibili\n"
"ad altri!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Per favore scegli il motivo della revoca:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Cancella"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probabilmente volevi scegliere %d)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Motivo della revoca: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Non � stata data una descrizione)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Va bene cos�? "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "creata una chiave debole - riprovo\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
"ho provato %d volte!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostrami ulteriori informazioni\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
msgstr[1] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
msgstr[1] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6801,7 -5469,6 +6863,7 @@@ msgstr[1] "
"la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6813,45 -5480,38 +6875,45 @@@ msgstr[1] "
"la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: la chiave � stata revocata"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
"chiave %08lX: non c'� una subchiave per la firma di collegamento della "
"subchiave\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata "
"inespansa.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6860,7 -5520,6 +6922,7 @@@ msgstr "
"lunga).\n"
"Usata inespansa.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6870,55 -5529,45 +6932,55 @@@ msgstr "
"lunga).\n"
"Usata inespansa.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "Firma %s da: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "firma:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "sar� usato il cifrario %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"la chiave non � indicata come insicura - impossibile usarla con il RNG "
"finto!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "saltata `%s': doppia\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "saltata: chiave pubblica gi� presente\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "trust record %lu, req type %d: write fallita: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6927,340 -5576,274 +6989,340 @@@ msgstr "
"# Lista dei valori della fiducia assegnati, creata il %s\n"
"# (Usa \"gpg --import-ownertrust\" per ripristinarli)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "riga troppo lunga\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "errore: impronta digitale non valida\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr "importa i valori di fiducia"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "errore cercando il record della fiducia: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "errore di lettura: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync fallita: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "impossibile creare `%s': %s\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "impossibile aprire `%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek fallita: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "transazione del trustdb troppo grande\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
- #, fuzzy, c-format
- msgid "can't access '%s': %s\n"
- msgstr "impossibile chiudere `%s': %s\n"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: la directory non esiste!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, fuzzy, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "impossibile chiudere `%s': %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: creazione del record della versione fallita: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: � stato creato un trustdb non valido\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: creato il trustdb\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "NOTA: il trustdb non � scrivibile\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb non valido\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: errore durante l'aggiornamento del record di versione: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: errore durante la lettura del record di versione: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: errore durante la scrittura del record di versione: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek fallita: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: non � un file di trustdb\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: record di versione con recnum %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versione %d del file non valida\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: errore durante la lettura del record libero: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: errore durante la scrittura del dir record: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: azzeramento di un record fallito: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: accodatura a un record fallita: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: creato il trustdb\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "linea di input pi� lunga di %d caratteri\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmi gestiti:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: errore durante la scrittura del dir record: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "chiave pubblica %08lX non trovata: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Policy: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "elenca le chiavi"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [files]|stampa tutti i message digests"
msgstr[1] "|algo [files]|stampa tutti i message digests"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7270,174 -5853,154 +7332,185 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [files]|stampa tutti i message digests"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "chiave %08lX: accettata come chiave affidabile\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "chiavi marcate definitivamente affidabili.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7446,7 -6008,6 +7519,7 @@@
msgid "no need for a trustdb check\n"
msgstr "non � necessario un controllo del trustdb\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "il prossimo controllo del trustdb sar� fatto il %s\n"
@@@ -7493,35 -6046,28 +7566,35 @@@ msgstr "non � stata trovata alcuna chia
msgid "public key of ultimately trusted key %s not found\n"
msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, 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"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
#, fuzzy
msgid "never"
msgstr "mai "
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7533,42 -6079,33 +7606,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "[revocata]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "[scaduta]"
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "sconosciuto"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7578,12 -6115,10 +7651,12 @@@ msgstr "
"Ricorda che il file con la firma (.sig or .asc) deve\n"
"essere il primo file indicato sulla riga di comando.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "linea di input %u troppo lunga o LF mancante\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "impossibile aprire `%s': %s\n"
@@@ -7912,7 -6379,6 +7985,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8057,9 -6493,6 +8130,9 @@@ msgstr "errore nella creazione della pa
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
@@@ -8567,7 -6895,6 +8640,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "errore leggendo il keyblock: %s\n"
@@@ -8592,134 -6915,104 +8665,134 @@@ msgstr "cancellazione del keyblock fall
msgid "no valid recipients given\n"
msgstr "(Non � stata data una descrizione)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "elenca le chiavi segrete"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "certificato danneggiato"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "certificato danneggiato"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "certificato danneggiato"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crea un output ascii con armatura"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "non usa per niente il terminale"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "modo batch: non fa domande"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "risponde \"s�\" a quasi tutte le domande"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "risponde \"no\" a quasi tutte le domande"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "aggiungi questo portachiavi alla lista"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|cerca le chiavi in questo keyserver"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usa l'algoritmo di cifratura NOME"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usa l'algoritmo di message digest NOME"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8730,47 -7023,38 +8803,47 @@@ msgstr "
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "impossibile connettersi a `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Non � stata data una descrizione)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = salta questa chiave\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "scrittura in `%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8788,7 -7069,6 +8861,7 @@@ msgstr "genera un certificato di revoca
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
@@@ -8803,32 -7081,26 +8876,32 @@@ msgstr "errore nella creazione della pa
msgid "error reading input: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? problema controllando la revoca: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -9007,7 -7246,6 +9080,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "Certificato di revoca creato.\n"
@@@ -9017,8 -7254,6 +9090,8 @@@
msgid "certificate cached\n"
msgstr "la preferenza %c%lu � doppia\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
@@@ -9627,13 -7739,11 +9700,13 @@@ msgstr "certificato danneggiato
msgid "force the use of the default OCSP responder"
msgstr "Inserisci l'user ID del revocatore designato: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9641,85 -7751,69 +9714,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "la preferenza %c%lu � doppia\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "NOTA: la chiave � stata revocata"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritmi gestiti:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9874,12 -7934,10 +9947,12 @@@ msgstr "uso: gpg [opzioni]
msgid "colons are not allowed in the socket name\n"
msgstr "Non � permesso usare %s con %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
@@@ -10375,77 -8331,61 +10448,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "firma fallita: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "firma fallita: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/ja.po
index 44111e9,e138ede..27b09c2
--- a/po/ja.po
+++ b/po/ja.po
@@@ -10,7 -10,6 +10,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 2.1.10\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2015-12-21 21:21+0900\n"
"Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
"Language-Team: none\n"
@@@ -103,8 -87,6 +103,8 @@@ msgstr "
msgid "PIN:"
msgstr "PIN:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "パスフレーズ:"
@@@ -154,24 -125,10 +154,24 @@@ msgstr "パスフレーズが不正で�
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, c-format
msgid "can't create '%s': %s\n"
msgstr "'%s'が作成できません: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr "以下のシリアル番号のカードを挿入してください"
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr "今のカードを抜き、以下のシリアル番号のカードを挿入してください"
@@@ -373,8 -291,6 +373,8 @@@ msgstr "新しい鍵を保護するた�
msgid "Please enter the new passphrase"
msgstr "新しいパスフレーズを入力してください"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -382,128 -298,92 +382,130 @@@ msgstr "
"@オプション:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "デーモン・モードで実行 (バックグラウンド)"
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "サーバ・モードで実行 (フォアグラウンド)"
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "冗長"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "いくらかおとなしく"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "sh-形式のコマンド出力"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "csh-形式のコマンド出力"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FILE|FILEからオプションを読み込みます"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "コンソールからデタッチしない"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "キーボードとマウスを占有しない"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "サーバのログ・ファイルを使う"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|PGMをPIN入力プログラムとして使う"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|PGMをSCdaemonプログラムとして使う"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "SCdaemonを使わない"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|NAMEからのコマンドを受け付ける"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "TTYの変更要求を無視する"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "Xディスプレイの変更要求を無視する"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|N秒後に保持したPINを無効とする"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "署名に対してPINの保持を使わない"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
msgid "disallow the use of an external password cache"
msgstr "外部のパスワードキャッシュの使用を認めない"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr "クライアントが鍵に\"trusted\"マークをつけることを認めない"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "パスフレーズの事前設定を認める"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ #, fuzzy
+ #| msgid "allow caller to override the pinentry"
+ msgid "disallow caller to override the pinentry"
msgstr "pinentryより優先してパスフレーズ入力を認める"
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr "Emacsを通じてパスフレーズを催促することを認める"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
msgid "enable ssh support"
msgstr "sshサポートを有功にする"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr "puttyサポートを有功にする"
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "使い方: @GPG_AGENT@ [オプション] (ヘルプは -h)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -511,137 -391,105 +513,143 @@@ msgstr "
"形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の秘密鍵の管理\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "無効なdebug-level '%s'が与えられました\n"
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: dirmngr/dirmngr.c:895
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
- #: agent/gpg-agent.c:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "'%s' からオプションを読み込みます\n"
- #: agent/gpg-agent.c:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "ソケットが作成できません: %s\n"
- #: agent/gpg-agent.c:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
- #: agent/gpg-agent.c:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "ソケットのナンス取得エラー\n"
- #: agent/gpg-agent.c:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() に失敗しました: %s\n"
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "ソケット'%s'でlisten\n"
- #: agent/gpg-agent.c:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "ディレクトリ'%s'が作成できません: %s\n"
- #: agent/gpg-agent.c:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "ディレクトリ'%s'が作成されました\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "警告: '%s'の安全でない許可 \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "'%s'でstat()が失敗しました: %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "'%s'をホーム・ディレクトリに使えません\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "ハンドラ0x%lx (fd %d に対する)が開始\n"
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "ハンドラ0x%lx (fd %d に対する)が終了\n"
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh ハンドラ0x%lx (fd %d に対する)が開始\n"
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh ハンドラ0x%lx (fd %d に対する)が終了\n"
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 停止しました\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "このセッションでgpg-agentは実行されていません\n"
@@@ -657,8 -503,6 +665,8 @@@ msgstr "
"形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
"パスワードキャッシュの管理\n"
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -666,9 -510,6 +674,9 @@@ msgstr "
"@コマンド:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -678,11 -519,9 +686,11 @@@ msgstr "
"オプション:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "使い方: gpg-protect-tool [オプション] (ヘルプは -h)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -690,16 -529,13 +698,16 @@@ msgstr "
"形式: gpg-protect-tool [オプション] [引数]\n"
"秘密鍵管理ツール\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "パスフレーズを入力してください。PKCS#12オブジェクトを解除します。"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
"パスフレーズを入力してください。新しいPKCS#12オブジェクトを解除します。"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -707,7 -543,6 +715,7 @@@ msgstr "
"GnuPGシステムにインポートされたオブジェクトを保護するためにパスフレーズを入力"
"してください"
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -715,11 -550,9 +723,11 @@@ msgstr "
"パスフレーズまたはPINを入力してください。\n"
"この操作を完了するのに必要です。"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "キャンセルされました\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "パスフレーズを問い合わせする際、エラー: %s\n"
@@@ -782,8 -605,6 +790,8 @@@ msgstr "究極的にこれを信用し%
msgid "Yes"
msgstr "はい"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "いいえ"
@@@ -815,12 -633,10 +823,12 @@@ msgstr "正しい
msgid "Wrong"
msgstr "誤り"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr "注意: パスフレーズは変更されていません。%0A今、変更してください。"
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@@ -829,26 -645,21 +837,26 @@@ msgstr "
"このパスフレーズは%.4s-%.2s-%.2sから変更されていません。%%0A今、変更してくだ"
"さい。"
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "パスフレーズを変更する"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "後で変更する"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "本当にこの鍵: keygrip%%0A %s%%0A %%C%%0Aを削除しますか?"
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
msgid "Delete key"
msgstr "鍵を削除する"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -856,7 -667,6 +864,7 @@@ msgstr "
"警告: この鍵はSSHの使用にもリストされています!\n"
"この鍵を削除するとリモート・マシンのアクセスの能力を失うかもしれません。"
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSAは8ビットの倍数のハッシュ長を必要とします\n"
@@@ -894,53 -697,43 +902,58 @@@ msgstr "保護アルゴリズム%d (%s)
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "保護ハッシュ・アルゴリズム%d (%s)はサポートされていません\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "パイプの作成エラー: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, c-format
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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "プロセスforkエラー: %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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "プロセス%dの終了待ちが失敗: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "'%s'の実行エラー: おそらくインストールされていません\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "'%s'の実行エラー: exitステイタス %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, c-format
msgid "error running '%s': terminated\n"
msgstr "'%s'の実行エラー: 終了しました\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "プロセス %d のexitコード取得エラー: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "プロセス%dの終了待ちが失敗: %s\n"
+
+#: common/simple-pwquery.c:376
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "'%s'へ接続できません: %s\n"
@@@ -953,15 -744,17 +966,21 @@@ msgstr "gpg-agentとの通信障害\n
msgid "problem setting the gpg-agent options\n"
msgstr "gpg-agentオプションの設定の問題\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "ユーザによる取消し\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "エージェントに障害\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "エージェントに問題: %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "コア・ダンプを無効にできません: %s\n"
@@@ -1031,19 -810,20 +1050,24 @@@ msgstr "%luバイトの確保におい�
msgid "out of core while allocating %lu bytes"
msgstr "%luバイトの確保においてメモリが足りません"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "十分なメモリの確保のエラー: %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
"%s:%u: \"%s\"は、使われなくなったオプションです - なんの効果もありません\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr ""
"*警告*: \"%s%s\"は、使われなくなったオプションです - なんの効果もありません\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "未知のdebugフラグ'%s'は無視されました\n"
@@@ -1334,7 -1047,6 +1358,7 @@@ msgstr "オプション\"%.50s\"はあ�
msgid "command \"%.50s\" is ambiguous\n"
msgstr "コマンド\"%.50s\"はあいまいです\n"
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "メモリがありません\n"
@@@ -1343,22 -1054,14 +1367,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "無効なオプション \"%.50s\"\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "あなたはバグを発見しました ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "'%s'から'%s'への変換は利用できません\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_openに失敗しました: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "'%s'から'%s'への変換に失敗: %s\n"
@@@ -1397,166 -1093,141 +1416,183 @@@ msgstr "lock '%s' は作成されませ
msgid "waiting for lock %s...\n"
msgstr "lock %s を待ちます...\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "外装: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "無効な外装ヘッダー: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "外装ヘッダー: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "無効なクリア・テクスト署名ヘッダー\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "不明の外装ヘッダー: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "入れ子のクリア・テクスト署名\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "予期せぬ外装: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "無効なダッシュでエスケープされた行: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "無効な64進文字%02Xをスキップしました\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "ファイル末尾が早すぎます (CRCがありません)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "ファイル末尾が早すぎます (CRCの途中)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "CRCの書式が正しくありません\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRCエラー。%06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "ファイル末尾が早すぎます (後尾部の中にあります)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "後尾の行にエラーがあります\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "有効なOpenPGPデータが見つかりません。\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "無効な外装: 行の長さが%d文字を超えています\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"外装の中にquoted printable文字があります。おそらくバグのあるMTAが使われたので"
"しょう\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "人には読めません"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
"注釈名には印字可能な文字か空白のみを使い、'='で終わらなければなりません\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "ユーザ注釈名は、'@'文字を含まなければなりません\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "ユーザ注釈名は、一つより大きい'@'文字を含んではなりません\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "注釈名の値に制御文字を使ってはいけません\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "ユーザ注釈名は、一つより大きい'@'文字を含んではなりません\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "注釈名には印字可能な文字か空白のみを使い、'='で終わらなければなりません\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "*警告*: 無効な注釈データを発見\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "人には読めません"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "プロキシ%sのクライアントへの問い合わせが失敗しました\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "パスフレーズを入力: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "鍵リング'%s'の作成エラー: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "*警告*: %sは%sより優先\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGPカードが利用できません: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGPカードno. %sを検出\n"
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "これはバッチ・モードではできません\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "このコマンドが使えるのはバージョン2のカードだけです\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
msgid "Reset Code not or not anymore available\n"
msgstr "リセット・コードが(もはや)利用可能ではありません\n"
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "あなたの選択は? "
@@@ -1618,20 -1275,10 +1654,15 @@@ msgstr "公開鍵を取得するURL:
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "エラー: URLが長すぎます (上限%d文字)。\n"
- #: g10/card-util.c:799 tools/no-libgcrypt.c:30
- #, c-format
- msgid "error allocating enough memory: %s\n"
- msgstr "十分なメモリの確保のエラー: %s\n"
-
- #: g10/card-util.c:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "'%s'の書き込みエラー: %s\n"
@@@ -1725,13 -1353,10 +1756,13 @@@ msgstr "暗号化鍵の鍵長は? (%u)
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "認証鍵の鍵長は? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%uビットに切り上げます\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 鍵長は %u-%u の範囲でなければなりません\n"
@@@ -1785,9 -1400,6 +1816,9 @@@ msgstr " (2) 暗号化鍵\n
msgid " (3) Authentication key\n"
msgstr " (3) 認証鍵\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "無効な選択です。\n"
@@@ -1816,7 -1422,6 +1847,7 @@@ msgstr "続けますか? (y/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "工場出荷リセットを行いますか? (本当なら \"yes\" と入力) "
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "このメニューを終了"
@@@ -1824,7 -1428,6 +1855,7 @@@
msgid "show admin commands"
msgstr "管理コマンドを表示"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "このヘルプを表示"
@@@ -1900,123 -1485,93 +1931,123 @@@ msgstr "管理者コマンドが許可�
msgid "Admin commands are not allowed\n"
msgstr "管理者コマンドは禁止されています\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "無効なコマンド (\"help\"を参照)\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "このコマンドで--outputは機能しません\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "'%s'が開けません\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "鍵\"%s\"が見つかりません: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "鍵ブロックの読み込みエラー: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, c-format
msgid "key \"%s\" not found\n"
msgstr "鍵\"%s\"が見つかりません\n"
- #: g10/delkey.c:130 g10/delkey.c:137
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(フィンガー・プリントで鍵を指定してない限り)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "\"--yes\"なしでバッチ・モードではできません\n"
- #: g10/delkey.c:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "この鍵を鍵リングから削除しますか? (y/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
msgid "This is a secret key! - really delete? (y/N) "
msgstr "これは秘密鍵です! 本当に削除しますか? (y/N) "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "秘密%sの削除に失敗しました: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "鍵"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "subkey"
msgstr "副鍵: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "鍵ブロックの削除に失敗しました: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "所有者信用情報をクリアしました\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "この公開鍵にたいする秘密鍵\"%s\"があります!\n"
- #: g10/delkey.c:272
++#: g10/delkey.c:271
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "まず\"--delete-secret-keys\"オプションでこれを削除してください。\n"
- #: g10/encrypt.c:226 g10/sign.c:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "パスフレーズの作成エラー: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "S2Kモードのため、共通鍵ESKパケットを使えません\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "暗号方式 %s を使います\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, c-format
msgid "'%s' already compressed\n"
msgstr "'%s'はもう圧縮済みです\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "*警告*: '%s'は空のファイルです\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, c-format
msgid "reading from '%s'\n"
msgstr "'%s'から読み込み\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"*警告*: 共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2024,37 -1579,30 +2055,37 @@@
msgstr ""
"*警告*: 圧縮アルゴリズム %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "%sを%sモードで使うことはできません\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s暗号化 受信者:\"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "%sを%sモードで使うことはできません\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s暗号化済みデータ\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "不明のアルゴリズム%dによる暗号化\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "*警告*: メッセージは共通鍵暗号方式の弱い鍵で暗号化されています。\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "暗号化パケットの取扱いで障害\n"
@@@ -2112,65 -1649,49 +2143,65 @@@ msgstr "*警告*: 一時ファイルを
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "*警告*: 一時ディレクトリ'%s'を削除できません: %s\n"
- #: g10/export.c:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "ローカルのみと指定された署名をエクスポートします"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr "ユーザIDの属性(通常フォトID)をエクスポートします"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "\"sensitive\"(機密)と指定された失効鍵をエクスポートします"
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "エクスポートの際、利用できない部分を除去する"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr "エクスポートの際、できるだけ除去する"
- #: g10/export.c:896
++#: g10/export.c:895
msgid " - skipped"
msgstr " - スキップされました"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "秘密鍵のエクスポートは認められません\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "鍵%s: PGP 2.x形式の鍵です - スキップします\n"
- #: g10/export.c:1241
++#: g10/export.c:1240
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "鍵%s: 鍵はカード上にあります - スキップします\n"
- #: g10/export.c:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "*警告*: 何もエクスポートされていません\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "'%s'の作成エラー: %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[ユーザIDが見つかりません]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(オプション'%s'の引数を確認ください)\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, fuzzy, c-format
#| msgid ""
#| "Warning: value '%s' for option '%s' should be a long key ID or a "
@@@ -2180,65 -1701,53 +2211,65 @@@ msgstr "
"警告: 値'%s'(オプション'%s'に対する)は長い鍵IDかフィンガープリントであるべき"
"です。\n"
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "'%s'でクローズのエラー: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error searching the keyring: %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "鍵リング探索エラー: %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "'%s'を %s から自動取得\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "'%s'を %s から取得する際のエラー: %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "フィンガープリントがありません"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "using \"%s\" as default secret key\n"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "デフォルトの秘密鍵として\"%s\"を用います\n"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "using \"%s\" as default secret key\n"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "デフォルトの秘密鍵として\"%s\"を用います\n"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
- #: g10/getkey.c:3296
++#: g10/getkey.c:3301
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "副鍵%s(主鍵%sではなく)を用います\n"
- #: g10/gpg.c:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "署名を作成"
@@@ -2246,11 -1754,9 +2277,11 @@@
msgid "make a clear text signature"
msgstr "クリア・テクスト署名を作成"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "分遣署名を作成"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "データを暗号化"
@@@ -2258,15 -1763,12 +2289,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "暗号化には共通鍵暗号方式のみを使用"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "データを復号 (デフォルト)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "署名を検証"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "鍵の一覧"
@@@ -2278,15 -1778,12 +2309,15 @@@ msgstr "鍵と署名の一覧
msgid "list and check key signatures"
msgstr "鍵署名の検査と一覧"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "鍵とフィンガープリントの一覧"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "秘密鍵の一覧"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "新しい鍵ペアを生成"
@@@ -2306,7 -1799,6 +2337,7 @@@ msgstr "全機能の鍵ペアを生成
msgid "generate a revocation certificate"
msgstr "失効証明書を生成"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "公開鍵リングから鍵を削除"
@@@ -2334,7 -1820,6 +2365,7 @@@ msgstr "鍵へローカルに署名
msgid "sign or edit a key"
msgstr "鍵への署名や編集"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "パスフレーズの変更"
@@@ -2382,23 -1856,20 +2413,25 @@@ msgstr "信用データベースを更�
msgid "print message digests"
msgstr "メッセージ・ダイジェストを表示"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "サーバ・モードで実行"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ #, fuzzy
+ #| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|TOFUポリシーを鍵に設定する(good, unknown, bad, ask, auto)"
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ASCII形式の外装を作成"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|USER-ID用に暗号化"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
@@@ -2410,11 -1879,9 +2443,11 @@@ msgstr "|N|圧縮レベルをNに設�
msgid "use canonical text mode"
msgstr "正準テキスト・モードを使用"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|出力をFILEに書き出す"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "無変更"
@@@ -2426,7 -1891,6 +2459,7 @@@ msgstr "上書き前に確認
msgid "use strict OpenPGP behavior"
msgstr "厳密なOpenPGPの振舞を採用"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2434,7 -1898,6 +2467,7 @@@ msgstr "
"@\n"
"(コマンドとオプション全部の一覧は、マニュアル・ページをご覧ください)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2454,11 -1917,9 +2487,11 @@@ msgstr "
" --list-keys [名前] 鍵を表示\n"
" --fingerprint [名前] フィンガープリントを表示\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "使い方: @GPG@ [オプション] [ファイル] (ヘルプは -h)"
- #: g10/gpg.c:988
++#: g10/gpg.c:991
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2468,7 -1929,6 +2501,7 @@@ msgstr "
"署名、検査、暗号化または復号\n"
"デフォルトの操作は、入力データに依存\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2476,577 -1936,448 +2509,577 @@@ msgstr "
"\n"
"サポートしているアルゴリズム:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "公開鍵: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "暗号方式: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "ハッシュ: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "圧縮: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "使い方: %s [オプション] %s\n"
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "対立するコマンド\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "=記号が、グループ定義'%s'内に見つかりません\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない所有\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない所有\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない所有\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない許可\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない許可\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない許可\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1537
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1546
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1549
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1759
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "不明のコンフィグレーション項目'%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "鍵の一覧時にフォトIDを表示する"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
msgid "show key usage information during key listings"
msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "署名の一覧時にポリシーURLを表示する"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "署名の一覧時にすべての注釈を表示する"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "署名の一覧時にIETF標準注釈を表示する"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "署名の一覧時にユーザの注釈を表示する"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr "署名の一覧時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "鍵の一覧時にユーザIDの有効性を表示する"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "鍵の一覧に鍵リングの名前を表示する"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "署名の一覧時に有効期限の日付を表示する"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
msgid "available TOFU policies:\n"
msgstr "利用可能なTOFUポリシー:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "不明のTOFUポリシー'%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "不明のTOFU DBフォーマット'%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
- #: g10/gpg.c:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt が古すぎます (必要 %s, 現在 %s)\n"
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "*注意*: 普通%sは使いません!\n"
- #: g10/gpg.c:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s'は、有効な署名表現ではありません\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無効な pinentry mode '%s'です\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s'は、有効な文字集合ではありません\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無効なインポート・オプションです\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "無効なインポート・オプションです\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無効なエクスポート・オプションです\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "無効なエクスポート・オプションです\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無効な一覧オプションです\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "無効な一覧オプションです\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "署名の検証時にフォトIDを表示する"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "署名の検証時にポリシーURLを表示する"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "署名の検証時にすべての注釈を表示する"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "署名の検証時にIETF標準注釈を表示する"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "署名の検証時にユーザの注釈を表示する"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr "署名の検証時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "署名の検証時にユーザIDの有効性を表示する"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
msgid "show only the primary user ID in signature verification"
msgstr "署名の検証時に主なユーザIDだけをを表示する"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "PKAデータで署名を検証する"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr "有効なPKAデータで署名の信用度を上昇させる"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無効な検証オプションです\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "無効な検証オプションです\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-pathを%sに設定不能\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "*警告*: %sは%sより優先\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%sは%sとともに使うことはできません!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%sは%sとともに使っても無意味です!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s のため、セキュアでないメモリで実行しません\n"
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "選択された暗号アルゴリズムは、無効です\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "選択された圧縮アルゴリズムは、無効です\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-neededは正の値が必要です\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neededは1より大きな値が必要です\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
- #: g10/gpg.c:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3527
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3531
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "無効なデフォルトの優先指定\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "無効な個人用暗号方式の優先指定\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "無効な個人用ダイジェストの優先指定\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "無効な個人用圧縮の優先指定\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%sは%sではまだ機能しません\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3638
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3636
++#: g10/gpg.c:3643
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信用データベースの初期化に失敗しました: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
- #: g10/gpg.c:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [ファイル名]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [ファイル名]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [ファイル名]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [ファイル名]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [ファイル名]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ファイル名]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [ファイル名]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ファイル名]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [ファイル名]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [ファイル名]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key ユーザid"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key ユーザid"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key ユーザid [コマンド]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd <ユーザid>"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "鍵サーバへの送信に失敗しました: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "鍵サーバからの受信に失敗しました: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "鍵のエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "鍵のエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "鍵サーバの検索に失敗しました: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "鍵サーバの更新に失敗しました: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "外装除去に失敗しました: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "外装に失敗しました: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "鍵指定'%s'の構文解析エラー: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "'%s'は有効な鍵ID, フィンガープリント、keygripではないようです。\n"
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[ファイル名]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "開始します。メッセージを打ってください ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "あたえられた証明書ポリシーURLは無効です\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "あたえられた署名ポリシーURLは無効です\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "指定された優先鍵サーバURLは無効です\n"
@@@ -3058,7 -2387,6 +3091,7 @@@ msgstr "|FILE|鍵リングFILEの鍵を
msgid "make timestamp conflicts only a warning"
msgstr "日時の矛盾を警告だけにします"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|このFDにステイタス情報を書き出す"
@@@ -3083,125 -2407,99 +3116,125 @@@ msgstr "ヘルプはありません
msgid "No help available for '%s'"
msgstr "'%s'のヘルプはありません"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "ローカルだけとマークされた署名をインポートします"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "インポートの際、にpksキーサーバからのダメージを修正します"
- #: g10/import.c:111
++#: g10/import.c:110
msgid "do not clear the ownertrust values during import"
msgstr "インポートの際、所有者信用の値をクリアしない"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "インポート後、信用データベースを更新しない"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "既存の鍵に対する更新のみ認めます"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "インポート後、利用できない部分を鍵から除去します"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "インポート後、できるだけ除去します"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "型%dのブロックをスキップします\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "これまで%lu個の鍵を処理\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr " 処理数の合計: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " スキップしたPGP-2鍵: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " スキップした新しい鍵: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ユーザIDなし: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " インポート: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 変更なし: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新しいユーザID: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新しい副鍵: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新しい署名: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新しい鍵の失効: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 秘密鍵の読み込み: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 秘密鍵のインポート: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 無変更の秘密鍵: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未インポート: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 掃除された署名: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 掃除されたユーザID: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3210,193 -2508,153 +3243,193 @@@ msgstr "
"*警告*: 鍵%sには、これらのユーザIDに対して使用不可のアルゴリズムの優先指定が"
"あります\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": 暗号アルゴリズムの優先指定 %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": ダイジェスト・アルゴリズムの優先指定 %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": 圧縮アルゴリズムの優先指定 %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "あなたの優先指定を更新し、この鍵を再配布することが強く推奨されます\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "それによって、潜在的なアルゴリズム不一致の問題を避けられます\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "以下で、優先指定を更新できます: gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "鍵%s: ユーザIDがありません\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, c-format
msgid "key %s: %s\n"
msgstr "鍵 %s: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr "インポートの検査で拒否されました"
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "鍵%s: PKSの副鍵変造を修復\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "鍵%s: 受理した未自己署名のユーザID\"%s\"\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "鍵%s: 有効なユーザIDがありません\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "これはおそらく自己署名のないせいでしょう\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "鍵%s: 公開鍵が見つかりません: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "鍵%s: 新しい鍵です - スキップします\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "書き込み可能な鍵リングが見つかりません: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "'%s'への書き込み\n"
- #: g10/import.c:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "鍵リング'%s'の書き込みエラー: %s\n"
- #: g10/import.c:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "鍵%s: 公開鍵\"%s\"をインポートしました\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "鍵%s: こちらの複製と合いません\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
- #: g10/import.c:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
- #: g10/import.c:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "鍵%s: \"%s\" 新しいユーザIDを1個\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "鍵%s: \"%s\" 新しいユーザIDを%d個\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "鍵%s: \"%s\" 新しい署名を1個\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "鍵%s: \"%s\" 新しい署名を%d個\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "鍵%s: \"%s\" 新しい副鍵を1個\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "鍵%s: \"%s\" 新しい副鍵を%d個\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "鍵%s:\"%s\"変更なし\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "鍵%s: 秘密鍵をインポートしました\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "鍵 %s: 秘密鍵はもうあります\n"
- #: g10/import.c:1579
++#: g10/import.c:1578
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "鍵 %s: エージェントへの送信エラー: %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, c-format
msgid "secret key %s: %s\n"
msgstr "秘密鍵 %s: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "秘密鍵のインポートは禁止です\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
@@@ -3411,213 -2669,199 +3444,245 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "'%s'の移行には、スマードカードそれぞれで、以下を実行してください: %s\n"
- #: g10/import.c:1849
++#: g10/import.c:1848
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
- #: g10/import.c:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "鍵%s: 無効な失効証明書: %s - 拒否\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "鍵%s:\"%s\"失効証明書をインポートしました\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "鍵%s: 署名に対応するユーザIDがありません\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "鍵%s: ユーザID\"%s\"のサポートしていない公開鍵アルゴリズムです\n"
- #: g10/import.c:2026
++#: g10/import.c:2025
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "鍵%s: ユーザID\"%s\"の自己署名が、無効です\n"
- #: g10/import.c:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "鍵%s: 無効な直接鍵署名\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "鍵%s: 鍵に対応する副鍵がありません\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "鍵%s: 無効な副鍵の対応です\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "鍵%s: 多重副鍵の対応を削除します\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "鍵%s: 鍵失効に対する副鍵がありません\n"
- #: g10/import.c:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "鍵%s: 無効な副鍵失効です\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "鍵%s: 無効な副鍵の多重失効を削除します\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "鍵%s: スキップしたユーザID\"%s\"\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "鍵%s: スキップした副鍵\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "鍵%s: エクスポート不可な署名 (クラス0x%02X) - スキップします\n"
- #: g10/import.c:2245
++#: g10/import.c:2244
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "鍵%s: 失効証明書が誤って設定されています - スキップします\n"
- #: g10/import.c:2263
++#: g10/import.c:2262
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "鍵%s: 無効な失効証明書: %s - スキップします\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "鍵%s: 副鍵署名の場所が、誤っています - スキップします\n"
- #: g10/import.c:2285
++#: g10/import.c:2284
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "鍵%s: 予期せぬ署名クラス (0x%02X) - スキップします\n"
- #: g10/import.c:2414
++#: g10/import.c:2413
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "鍵%s: 重複したユーザIDの検出 - マージ\n"
- #: g10/import.c:2478
++#: g10/import.c:2477
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sを取ってきます\n"
- #: g10/import.c:2494
++#: g10/import.c:2493
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sが存在しません。\n"
- #: g10/import.c:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "鍵%s:\"%s\"失効証明書の追加\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "鍵%s: 直接鍵署名を追加\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "keybox'%s'の作成エラー: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, c-format
msgid "error creating keyring '%s': %s\n"
msgstr "鍵リング'%s'の作成エラー: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, c-format
msgid "keybox '%s' created\n"
msgstr "keybox'%s'が作成されました\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, c-format
msgid "keyring '%s' created\n"
msgstr "鍵リング'%s'ができました\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "keyblock リソース'%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, c-format
msgid "error opening key DB: %s\n"
msgstr "鍵DBを開く際のエラー: %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "鍵リング・キャッシュの再構築に失敗しました: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[失効]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[自己署名]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "不正な署名%d個\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "カードはダイジェスト・アルゴリズム %s をサポートしていません\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "Good signature from"
+ msgid " (reordered signatures follow)"
+ msgstr "正しい署名"
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "key %s: %s\n"
+ msgid "key %s:\n"
+ msgstr "鍵 %s: %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "ユーザID \"%s\": %d の署名が除去されました\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
msgstr[0] "鍵がないため1個の署名を検査しません\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "エラーのため1個の署名を検査しません\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "不正な署名%d個\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "有効な自己署名のないユーザIDを%d個検出\n"
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "正しい署名"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3628,17 -2872,14 +3693,17 @@@ msgstr "
"(パスポートを見せてもらったり、他から得たフィンガープリントを検査したり、など"
"など)\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = まぁまぁ信用する\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 充分に信用する\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3647,50 -2888,38 +3712,50 @@@ msgstr "
"信用署名の深さを入力してください。\n"
"深さが1より大きいと、署名しようとしている鍵で信用署名を作れます。\n"
- #: g10/keyedit.c:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "署名を制限するドメインを入力するか、空行を入力してください。\n"
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "ユーザID\"%s\"をスキップします、テキストのIDではありません。\n"
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ユーザID\"%s\"は、失効されています。"
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "それでもこの鍵に署名したいですか? (y/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " 署名不能。\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ユーザID \"%s\"は、期限切れです。"
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ユーザID \"%s\"は、自己署名されていません。"
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ユーザID \"%s\"は署名可能です。 "
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "署名しますか? (y/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3699,11 -2928,9 +3764,11 @@@ msgstr "
"\"%s\"にたいする自己署名は、\n"
"PGP 2.x形式の署名です。\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "OpenPGPの自己署名に格上げしたいですか? (y/N) "
- #: g10/keyedit.c:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3712,11 -2939,9 +3777,11 @@@ msgstr "
"\"%s\"に対するあなたの今の署名\n"
"は期限切れです。\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "新しい署名を発行し、期限切れ署名と置き換えたいですか? (y/N) "
- #: g10/keyedit.c:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3725,43 -2950,34 +3790,43 @@@ msgstr "
"\"%s\"にたいするあなたの今の署名\n"
"はローカルな署名です。\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "エクスポート可能な署名に格上げしたいですか? (y/N) "
- #: g10/keyedit.c:824
++#: g10/keyedit.c:1337
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\"は鍵%sでもうローカルに署名してあります\n"
- #: g10/keyedit.c:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\"は鍵%sでもう署名してあります\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "それでも再署名したいですか? (y/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "鍵%sで署名すべきものはありません\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "この鍵は期限切れです!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "この鍵は%sで期限が切れます。\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "同時に署名も期限切れとしたいですか? (Y/n) "
- #: g10/keyedit.c:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3770,31 -2986,25 +3835,31 @@@ msgstr "
"署名しようとしている鍵が実際に上記の名前の人のものかどうか、どの程度\n"
"注意して検証しましたか? 答がわからなければ、\"0\"を入力してください。\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 答えません。%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 全然、検査していません。%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 一応、検査しました。%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) かなり注意して検査しました。%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
msgid "Your selection? (enter '?' for more information): "
msgstr "選択は? (詳細は '?'): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3803,224 -3013,166 +3868,220 @@@ msgstr "
"本当にこの鍵にあなたの鍵\"%s\"で署名してよいですか\n"
"(%s)\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "自己署名になるでしょう。\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "*警告*: 署名は、エクスポート不可に設定されません。\n"
- #: g10/keyedit.c:1010
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "*警告*: 署名は、失効不可に設定されません。\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "署名は、エクスポート不可に設定されます。\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "署名は、失効不可に設定されます。\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "この鍵は全然、検査していません。\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "この鍵は一応、検査しました。\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "この鍵は、かなり注意して検査しました。\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "本当に署名しますか? (y/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "署名に失敗しました: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"鍵にはスタブあるいはカード上の項目しかありません - パスフレーズは変更されませ"
"ん。\n"
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "鍵 %s: パスフレーズの変更エラー: %s\n"
- #: g10/keyedit.c:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "鍵の署名を正しい場所に移動します\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "保存して終了"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "鍵のフィンガープリントを表示"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
msgid "show the keygrip"
msgstr "keygripを表示"
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "鍵とユーザIDの一覧"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "ユーザID Nの選択"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "副鍵Nの選択"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "署名の確認"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr "選択したユーザIDに署名する [* 以下の関連コマンドを参照 ]"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "選択したユーザIDにローカルに署名"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "選択したユーザIDに信用署名を署名する"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr "選択したユーザIDに失効不可の署名をする"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "ユーザIDの追加"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "フォトIDの追加"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "選択したユーザIDの削除"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "副鍵を追加"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "スマートカードへ鍵の追加"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "鍵をスマートカードへ移動"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "バックアップ鍵をスマートカードへ移動"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "選択した副鍵の削除"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "失効鍵の追加"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "選択したユーザIDから署名を削除する"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
msgid "change the expiration date for the key or selected subkeys"
msgstr "鍵または選択した副鍵の有効期限を変更する"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "選択したユーザIDを主にする"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "優先指定の一覧 (エキスパート)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "優先指定の一覧 (冗長)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "選択したユーザIDに優先指定リストを設定"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "選択したユーザIDに優先鍵サーバのURLを設定"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "選択したユーザIDに注釈を設定する"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "パスフレーズの変更"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "所有者信用の変更"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "選択したユーザIDの署名を失効"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "選択したユーザIDの失効"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "鍵の失効または選択した副鍵の失効"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "鍵を有効にする"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "鍵を無効にする"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "選択したフォトIDを表示"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "使えないユーザIDをコンパクトにし、使えない署名を鍵から除去"
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "使えないユーザIDをコンパクトにし、すべての署名を鍵から除去"
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "秘密鍵が利用できます。\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "この実行には秘密鍵がいります。\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4031,245 -3183,193 +4092,251 @@@ msgstr "
" 't' で始まると信用署名 (tsign)、'nr' で始まると失効不可署名\n"
" (nrsign)、もしくはこれらの組み合わせ (ltsign, tnrsign, など)となります。\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "鍵は、失効されています。"
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "本当に全ユーザIDに署名しますか? (y/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
msgid "Really sign all text user IDs? (y/N) "
msgstr "本当に全てのテキストユーザIDに署名しますか? (y/N) "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "ヒント: まず署名するユーザIDを選択します\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "不明の署名タイプ'%s'\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%sモードでこのコマンドは禁止です。\n"
- #: g10/keyedit.c:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "ユーザIDを少なくともひとつ選択してください。\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "('%s'コマンドを使用してください。)\n"
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "最後のユーザIDは削除できません!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr "選択した全ユーザIDを本当に削除しますか? (y/N) "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "この主鍵を本当に移動しますか? (y/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "鍵をきっかり1つ選択してください。\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "コマンドはファイル名の引数を期待します\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "バックアップ鍵を'%s'から読み込みする際のエラー: %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "鍵を少なくとも1本選択してください。\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "選択した鍵を本当に削除しますか? (y/N) "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "この鍵を本当に削除しますか? (y/N) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "選択した全ユーザIDを本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "このユーザIDを本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "この鍵全体を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "選択した副鍵を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "この副鍵を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"ユーザが指定した信用データベースを利用中、所有者信用は設定できません。\n"
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "優先指定の一覧を設定:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "選択したユーザIDの優先指定を本当に更新しますか? (y/N) "
- #: g10/keyedit.c:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "優先指定を本当に更新しますか? (y/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "変更を保存しますか? (y/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "保存せずに終了しますか? (y/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "更新に失敗しました: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "鍵は無変更なので更新は不要です。\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\"はフィンガープリントではありません\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" はプライマリ・フィンガープリントではありません\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "read error in '%s': %s\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "'%s'で読み込みエラー: %s\n"
+
++#: g10/keyedit.c:3099
msgid "No matching user IDs."
msgstr "マッチするユーザIDはありません。"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
msgid "Nothing to sign.\n"
msgstr "署名するものがありません。\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "ダイジェスト: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "機能: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "鍵サーバ 修正しない"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "優先鍵サーバ: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "注釈: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x形式ユーザIDの優先指定が、ありません。\n"
- #: g10/keyedit.c:3101
++#: g10/keyedit.c:3620
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "%sで%s鍵%sによって以下の鍵は、失効されました\n"
- #: g10/keyedit.c:3125
++#: g10/keyedit.c:3644
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "この鍵は、%s鍵%sによって失効可能です"
- #: g10/keyedit.c:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(機密指定)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "作成: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "失効: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "期限切れ: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "有効期限: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "利用法: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "カード番号: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "信用: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "有効性: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "この鍵は使用禁止に設定されています"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4277,17 -3377,12 +4344,17 @@@ msgstr "
"プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
"ということを念頭においてください。\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "失効"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "期限切れ"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4295,15 -3390,12 +4362,15 @@@ msgstr "
"*警告*: 主たるユーザIDがありません。このコマンドは、別な\n"
" ユーザIDが主になると仮定する場合があります。\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "*警告*: あなたの暗号副鍵はもうすぐ期限切れとなります。\n"
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
msgid "You may want to change its expiration date too.\n"
msgstr "その有効期限も変更したいでしょう\n"
- #: g10/keyedit.c:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4313,72 -3405,57 +4380,72 @@@ msgstr "
"は、\n"
" この鍵を拒否するかもしれません。\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "それでも追加したいですか? (y/N) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
- #: g10/keyedit.c:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr "そういったユーザIDはすでにこの鍵に存在しています!\n"
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "この正しい署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "この無効な署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "この不明の署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "この自己署名を本当に削除しますか? (y/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
msgstr[0] "%d個の署名を削除しました。\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "何も削除していません。\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "無効"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ユーザID \"%s\" は、コンパクトになりました: %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "ユーザID \"%s\": %d の署名が除去されました\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ユーザID \"%s\": 既に最小化されています\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ユーザID \"%s\": 既にクリーンとなっています\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4388,259 -3465,201 +4455,259 @@@ msgstr "
"では、\n"
" この鍵を拒否するかもしれません。\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x形式の鍵には指名失効者を追加できません。\n"
- #: g10/keyedit.c:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "指名失効者のユーザIDを入力してください: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x形式の鍵は、指名失効者に任命できません\n"
- #: g10/keyedit.c:3920
++#: g10/keyedit.c:4439
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "指名失効者には、その鍵自体を任命できません\n"
- #: g10/keyedit.c:3942
++#: g10/keyedit.c:4461
msgid "this key has already been designated as a revoker\n"
msgstr "この鍵は失効者としてもう指名されています\n"
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "*警告*: ある鍵を指名失効者に設定すると、元に戻せません!\n"
- #: g10/keyedit.c:3967
++#: g10/keyedit.c:4485
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
- #: g10/keyedit.c:4018
++#: g10/keyedit.c:4536
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "本当に複数の副鍵の失効期限を変更しますか? (y/N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "副鍵の有効期限を変更します。\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "主鍵の有効期限を変更します。\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3鍵の有効期限は変更できません\n"
- #: g10/keyedit.c:4144
++#: g10/keyedit.c:4768
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "署名する副鍵%sはすでに相互証明されています\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "副鍵 %s は署名をしないので、相互証明の必要はありません\n"
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "ユーザIDをきっかりひとつ選択してください。\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "ユーザID\"%s\"のv3自己署名をスキップします\n"
- #: g10/keyedit.c:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "優先鍵サーバURLを入力してください: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
msgid "Are you sure you want to replace it? (y/N) "
msgstr "本当に置き換えたいですか? (y/N) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
msgid "Are you sure you want to delete it? (y/N) "
msgstr "本当に削除したいですか? (y/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "注釈を入力: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "進みますか? (y/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d番のユーザIDはありません\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "ハッシュ%sのユーザIDはありません\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "鍵ID'%s'の副鍵はありません\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "%d番の副鍵はありません\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ユーザID:\"%s\"\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "%sで%s%s%sに署名されています\n"
- #: g10/keyedit.c:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (エクスポート不可)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "この署名は%sで期限切れです。\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "それでも本当に失効したいですか? (y/N) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "この署名に対する失効証明書を作成しますか? (y/N) "
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "あなたによって署名されていません。\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "これらのユーザIDに鍵%sで署名しました:\n"
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (失効不可)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "あなたの鍵%sで%sに失効されています\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "これらの署名を失効しようとしています:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "失効証明書を本当に作成しますか? (y/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "秘密鍵がありません\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ユーザID\"%s\"は、もう失効されています\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "*警告*: ユーザID署名が、%d秒未来です\n"
- #: g10/keyedit.c:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "鍵 %s は、もう失効されています。\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "副鍵 %s は、もう失効されています。\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s (大きさ%ld) の鍵%s (uid %d) のフォトIDとして表示\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "優先指定'%s'の重複\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "暗号方式の優先指定が多すぎます\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "ダイジェストの優先指定が多すぎます\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "圧縮の優先指定が多すぎます\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "優先指定の文字列に無効な項目'%s'があります\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "直接署名を書き込みます\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "自己署名を書き込みます\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "鍵対応への署名を書き込みます\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "無効な鍵長。%uビットにします\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "鍵長を%uビットに丸めます\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"*警告*: いくつかのOpenPGPプログラムはこのダイジェスト長のDSA鍵を扱うことがで"
"きません\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Sign"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Certify"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Encrypt"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Authenticate"
@@@ -4654,150 -3673,119 +4721,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "鍵%sに認められた操作: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "現在の認められた操作: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 署名機能を反転する\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 暗号機能を反転する\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 認証機能を反転する\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 完了\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "ご希望の鍵の種類を選択してください:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA と RSA (デフォルト)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA と Elgamal\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (署名のみ)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (署名のみ)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (暗号化のみ)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (暗号化のみ)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (機能をあなた自身で設定)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (機能をあなた自身で設定)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC と ECC\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (署名のみ)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (機能をあなた自身で設定)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (暗号化のみ)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) 既存の鍵\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "keygripを入力: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "有効なkeygrip (40桁の16進数字)ではありません\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "このkeygripの鍵はありません\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 鍵は %u から %u ビットの長さで可能です。\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "副鍵の鍵長は? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "鍵長は? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "要求された鍵長は%uビット\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, c-format
msgid "rounded to %u bits\n"
msgstr "%uビットに切り上げます\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
msgid "Please select which elliptic curve you want:\n"
msgstr "ご希望の楕円曲線を選択してください:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4813,7 -3801,6 +4880,7 @@@ msgstr "
" <n>m = 鍵は n か月間で期限切れ\n"
" <n>y = 鍵は n 年間で期限切れ\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4829,38 -3816,30 +4896,38 @@@ msgstr "
" <n>m = 署名は n か月間で期限切れ\n"
" <n>y = 署名は n 年間で期限切れ\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "鍵の有効期間は? (0)"
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "署名の有効期間は? (%s)"
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "無効な値\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "%sは無期限です\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "%署名は無期限です\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "鍵は%sで期限切れとなります\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "署名は%sで期限切れとなります\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -4868,11 -3847,9 +4935,11 @@@ msgstr "
"このシステムでは、2038年以降の日付を表示することはできませんが、\n"
"2106年まで正しく処理されます。\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "これで正しいですか? (y/N) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4886,7 -3863,6 +4953,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -4902,49 -3878,38 +4969,49 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "本名: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "名前に無効な文字があります\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr "キャラクタ'%s'と'%s'は名前に使えません\n"
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "名前を数字で始めてはいけません\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "名前は5文字以上でなければなりません\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "電子メール・アドレス: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "有効な電子メール・アドレスではありません\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "コメント: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "コメントに無効な文字があります\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "あなたは文字集合'%s'を使っています。\n"
- #: g10/keygen.c:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4955,7 -3920,6 +5022,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "電子メールのアドレスを本名やコメントに入れないように\n"
@@@ -4970,31 -3934,24 +5037,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "名前(N)、コメント(C)、電子メール(E)の変更、または終了(Q)? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2665
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "名前(N)、コメント(C)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
- #: g10/keygen.c:2657
++#: g10/keygen.c:2670
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "名前(N)、電子メール(E)の変更、または終了(Q)? "
- #: g10/keygen.c:2658
++#: g10/keygen.c:2671
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "名前(N)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
- #: g10/keygen.c:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "まずエラーを修正してください\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5005,12 -3962,10 +5072,12 @@@ msgstr "
"す、ディスクにアクセスするなどの他の操作を素数生成の間に行うことで、乱数生\n"
"成器に十分なエントロピーを供給する機会を与えることができます。\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "鍵の生成に失敗しました: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5021,62 -3976,49 +5088,62 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr "続けますか? (Y/n) "
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" の鍵はもうあります\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
msgid "Create anyway? (y/N) "
msgstr "それでも鍵を作成しますか? (y/N) "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
msgid "creating anyway\n"
msgstr "いずれにしろ鍵を作成\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "注意: 全機能の鍵生成には \"%s %s\" を使います。\n"
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "鍵の生成が取り消されました。\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "バックアップ・ファイル'%s'が作成できません: %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "*注意*: カード鍵のバックアップが'%s'へ保存されます\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, c-format
msgid "writing public key to '%s'\n"
msgstr "'%s'へ公開鍵を書き込みます\n"
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "書き込み可能な公開鍵リングが見つかりません: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
- #: g10/keygen.c:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5084,535 -4026,429 +5151,542 @@@ msgstr "
"この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
"\"--edit-key\"コマンドを使って副鍵を生成してください。\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "*注意*: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
- #: g10/keygen.c:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "主鍵の秘密部分が利用できません。\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鍵の秘密部分はカード上に保存されています。\n"
- #: g10/keygen.c:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "本当に作成しますか? (y/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "無期限 "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "クリティカルな署名ポリシー: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "署名ポリシー: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "クリティカルな優先鍵サーバ: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "クリティカルな署名注釈: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "署名注釈: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d good signatures\n"
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
msgstr[0] "正しい署名%d個\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "エラーのため1個の署名を検査しません\n"
+
++#: g10/keylist.c:562
#, fuzzy, c-format
#| msgid "Warning: %lu key(s) skipped due to their large size\n"
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] "*警告*: %lu 鍵がその大きさのためスキップされました\n"
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "鍵リング"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "\"%s\"をスキップしました: %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr " 主鍵フィンガープリント:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " 主鍵フィンガープリント:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " 副鍵フィンガープリント:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " フィンガープリント ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " カードシリアル番号 ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, c-format
msgid "caching keyring '%s'\n"
msgstr "鍵リング'%s'をキャッシュします\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu個の鍵までキャッシュ済 (%lu個の署名)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] "キャッシュをフラッシュします"
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] "不正な署名1個\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: 鍵リングができました\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr "dirmngrのプロキシ・オプション設定を押し切る"
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "失効した鍵を検索結果に含める"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "key IDによる検索に副鍵も含める"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr "dirmngrのタイムアウト・オプション設定を押し切る"
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "署名の検証時に自動的に鍵を取得する"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr "鍵に設定される優先鍵サーバURLを与える"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "鍵に設定されたPKAレコードを鍵の取得時に与える"
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "使用禁止"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "番号(s)、N)次、またはQ)中止を入力してください >"
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "無効な鍵サーバ・プロトコルです (us %d!=handler %d)\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\"鍵IDではありません: スキップします\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "%d本の鍵を%sから更新\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "*警告*: 鍵%sを%s経由で更新できません: %s\n"
- #: g10/keyserver.c:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "鍵\"%s\"が鍵サーバに見つかりません\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "鍵が鍵サーバに見つかりません\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "既知の鍵サーバがありません (オプション--keyserverを使いましょう)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "鍵%sを%sからサーバ%sに要求\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "鍵%sを%sに要求\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "invalid keyserver options\n"
msgid "no keyserver known\n"
msgstr "無効な鍵サーバ・オプションです\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "鍵%sを%sへ送信\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, c-format
msgid "requesting key from '%s'\n"
msgstr "鍵を'%s'から要求\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "*警告*: URI %s からデータを取れません: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "変な長さの暗号化済みセッション鍵 (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 暗号化済みセッション鍵\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "不明のダイジェスト・アルゴリズムで生成されたパスフレーズ %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "公開鍵は%sです\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "公開鍵による暗号化済みデータ: 正しいDEKです\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
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:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "%s鍵, ID %sで暗号化されました\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公開鍵の復号に失敗しました: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "%lu 個のパスフレーズで暗号化\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "1 個のパスフレーズで暗号化\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s暗号化済みデータを仮定\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA暗号方式は利用不能なので、楽天的ですが%sで代用しようとしています\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "*警告*: メッセージの完全性は保護されていません\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "復号に成功\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "*警告*: 暗号化されたメッセージは改竄されています!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "復号に失敗しました: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "*注意*: 送信者は\"極秘とする\"ように求めています\n"
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "元のファイル名='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "*警告*: 複数のプレインテクストが見られます\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "スタンドアロン失効 - \"gpg --import\"を使って適用してください\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "署名が見つかりません\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\"からの*不正な*署名"
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\"からの期限切れの署名"
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\"からの正しい署名"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "署名の検証を省略\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "このあいまいな署名データは取り扱えません\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "%sに施された署名\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " %s鍵%sを使用\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "%sに%s鍵ID %sで施された署名\n"
- #: g10/mainproc.c:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "以下に鍵があります: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[不確定]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " 別名\"%s\""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "期限切れの署名 %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "この署名は%sで期限切れとなります\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s署名、ダイジェスト・アルゴリズム %s%s%s\n"
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "バイナリ"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "テキストモード"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "不明の"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
msgid ", key algorithm "
msgstr "、鍵アルゴリズム "
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
"*警告*: 分遣署名ではありません。ファイル「%s」は検証され*ませんでした*!\n"
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "署名を検査できません: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "分遣署名でありません\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "*警告*: 多重署名の検出。最初のものだけ検査します。\n"
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "クラス0x%02xのスタンドアロン署名\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "古い形式 (PGP 2.x) の署名\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "'%s'のfstatが%sで失敗しました: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d)が%sで失敗しました: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "*警告*: 実験的公開鍵アルゴリズム%sを使用します\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "*警告*: Elgamal署名+暗号化鍵は廃止されています\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "*警告*: 実験的暗号アルゴリズム %s を使用します\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "*警告*: 実験的ダイジェスト・アルゴリズム %sを使用\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "*警告*: ダイジェスト・アルゴリズム %s は廃止されています\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "注意: アルゴリズム %s を用いた署名は拒否されました\n"
- #: g10/misc.c:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "%s:%u: read error: %s\n"
msgid "(reported error: %s)\n"
msgstr "%s:%u: 読み込みエラー: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in '%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "'%s'で読み込みエラー: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: 廃止されたオプション\"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "*警告*: \"%s\"は、廃止されたオプションです\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "\"%s%s\"を代わりに使ってください\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "*警告*: \"%s\" は、廃止されているコマンドです - 使わないでください\n"
- #: g10/misc.c:1081
++#: g10/misc.c:1079
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
"%s:%u: \"%s\"は、このファイルで使われなくなりました - %sになんの効果もありま"
"せん\n"
- #: g10/misc.c:1085
++#: g10/misc.c:1083
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@@ -5620,101 -4456,80 +5694,101 @@@ msgstr "
"*警告*: \"%s%s\"は、使われなくなったオプションです - %s以外になんの効果もあり"
"ません\n"
- #: g10/misc.c:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "無圧縮"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "無圧縮|なし"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "このメッセージは、%sでは使用できません\n"
- #: g10/misc.c:1469
++#: g10/misc.c:1467
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "あいまいなオプション'%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, c-format
msgid "unknown option '%s'\n"
msgstr "不明のオプション'%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "ECDSAの公開鍵は8ビットの倍数のSECエンコーディングを期待します\n"
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "不明の弱いダイジェスト'%s'\n"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, c-format
msgid "File '%s' exists. "
msgstr "ファイル'%s'は既に存在します。"
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "上書きしますか? (y/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: 不明の拡張子\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "新しいファイル名を入力してください"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "標準出力に書き込みます\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "署名されたデータが'%s'にあると想定します\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, c-format
msgid "new configuration file '%s' created\n"
msgstr "新しいコンフィグレーション・ファイル'%s'ができました\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "*警告*: '%s'のオプションはこの実行では、まだ有効になりません\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "公開鍵のアルゴリズム%dは、取り扱えません\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "*警告*: 潜在的にセキュアでない共通鍵暗号化セッション鍵です\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "型%dの下位パケットにクリティカル・ビットを発見\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "エージェントに問題: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (主鍵ID %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -5729,15 -4544,12 +5803,15 @@@ msgstr "
"%uビット %s 鍵, ID %s,\n"
"作成日付 %s%s。\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "パスフレーズを入力\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "ユーザによる取消し\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -5746,42 -4558,33 +5820,42 @@@ msgstr "
"次のユーザの秘密鍵のロックを解除するには\n"
"パスフレーズがいります:\"%s\"\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%uビット%s鍵, ID %s作成日付は%s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (主鍵ID %s の副鍵)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "OpenPGPの秘密鍵のロックを解除するためにパスフレーズを入力してください:"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "OpenPGPの秘密鍵をインポートするためにパスフレーズを入力してください:"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
"OpenPGPの秘密副鍵をエクスポートするためにパスフレーズを入力してください:"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "OpenPGPの秘密鍵をエクスポートするためにパスフレーズを入力してください:"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "選択したOpenPGP副鍵を本当に永久に削除しますか? (y/N) "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "選択したOpenPGP秘密鍵を本当に永久に削除しますか? (y/N) "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, c-format
msgid ""
"%s\n"
@@@ -5841,31 -4636,24 +5915,31 @@@ msgstr "この写真は正しいです�
msgid "unable to display photo ID!\n"
msgstr "フォトIDが表示不能!\n"
- #: g10/pkclist.c:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "理由は指定されていません"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "鍵がとりかわっています"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "鍵(の信頼性)が損なわれています"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "鍵はもはや使われていません"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "ユーザIDがもはや有効でありません"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "失効理由: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "失効のコメント: "
@@@ -5879,90 -4667,71 +5953,90 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "信用度が指定されていません:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " 別名\"%s\"\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"この鍵がこのユーザをなのる本人のものかどうか、どれくらい信用できますか?\n"
- #: g10/pkclist.c:284
++#: g10/pkclist.c:283
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = 知らない、または何とも言えない\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = 信用し ない\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = 究極的に信用する\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = メーン・メニューに戻る\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = この鍵はとばす\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " q = 終了\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr "この鍵の最小信用レベル: %s\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "あなたの決定は? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "本当にこの鍵を究極的に信用しますか? (y/N) "
- #: g10/pkclist.c:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "究極的に信用した鍵への証明書:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr "%s: この鍵が本当に本人のものである、という兆候が、ありません\n"
- #: g10/pkclist.c:441
++#: g10/pkclist.c:440
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr "%s: この鍵が本当に本人のものである、という兆候が、少ししかありません\n"
- #: g10/pkclist.c:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "この鍵はたぶん本人のものです\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "この鍵は自分のものです\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -5972,127 -4741,99 +6046,127 @@@ msgstr "
"ません。今から行うことを＊本当に＊理解していない場合には、\n"
"次の質問にはnoと答えてください。\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "それでもこの鍵を使いますか? (y/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "*警告*: 信用できない鍵を使っています!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "*警告*: この鍵は失効されたようです (失効鍵は不在)\n"
- #: g10/pkclist.c:547
++#: g10/pkclist.c:562
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "*警告*: この鍵は指名失効者によって失効されています!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "*警告*: この鍵は所有者によって失効されています!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " 署名が偽物なこともある、ということです。\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "*警告*: この副鍵は所有者によって失効されています!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "注意: この鍵は使用禁止に設定されています。\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "注意: 確認された署名者のアドレスは'%s'です\n"
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "注意: 署名者のアドレス'%s'がDNSのエントリと一致しません\n"
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "PKA情報が有効のため、信用レベルがFULLに調整されました\n"
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "PKA情報が無効のため、信用レベルがNEVERに調整されました\n"
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "注意: この鍵は期限切れです!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "*警告*: この鍵は信用できる署名で証明されていません!\n"
- #: g10/pkclist.c:633
++#: g10/pkclist.c:648
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " この署名が所有者のものかどうかの検証手段がありません。\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "*警告*: この鍵は信用できません!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " この署名はおそらく 偽物 です。\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "*警告*: この鍵は十分に信用できる署名で証明されていません!\n"
- #: g10/pkclist.c:652
++#: g10/pkclist.c:667
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " この署名が所有者のものかどうか確信できません。\n"
- #: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: スキップ: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: スキップ: 公開鍵は使用禁止です\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: スキップ: 公開鍵はもうあります\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to '%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "'%s'へ接続できません: %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr ""
"オプション'%s'が与えられましたが、有効なデフォルト鍵が与えられていません\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "オプション'%s'が与えられましたが、オプション'%s'は与えられていません\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "ユーザIDを指定していません (\"-r\"を使いましょう) 。\n"
- #: g10/pkclist.c:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "今の受取人:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6100,161 -4841,125 +6174,161 @@@ msgstr "
"\n"
"ユーザIDを入力。空行で終了: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "そのユーザIDはありません。\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "スキップ: 公開鍵はデフォルトの受取人としてもう設定済みです\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "公開鍵は使用禁止です。\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "スキップ: 公開鍵はもう設定済みです\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "デフォルトの受取人\"%s\"が不明です\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "有効な宛先がありません\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "注意: 鍵%sには %s の機能がありません\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "注意: 鍵%sには%sに対する優先指定がありません\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"データは保存されていません。保存には\"--output\"オプションを使ってください\n"
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "分遣署名。\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "データ・ファイルの名前を入力: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "標準入力より読み込み中 ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "署名されたデータがありません\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "署名されたデータ'%s'が開けません\n"
- #: g10/plaintext.c:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "署名されたデータ fd=%d が開けません: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "匿名の受取人用です。秘密鍵%sを試します ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "終了。匿名の受取人用です。\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "DEKの旧式エンコーディングは、サポートしていません\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "暗号アルゴリズム%d%sは不明か使用禁止です\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "*警告*: 暗号アルゴリズム%sは受取人の優先指定に入っていません\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "*注意*: 秘密鍵%sは%sで期限切れとなります\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet に失敗しました: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "鍵%sにはユーザIDがありません\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "失効者:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(これは、機密指定の失効鍵です)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
msgid "Secret key is not available.\n"
msgstr "秘密鍵が利用できません。\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "この鍵に対する指名失効証明書を作成しますか? (y/N) "
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "ASCII外装出力を強制します。\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet に失敗しました: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "失効証明書を作成。\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "\"%s\"用の失効鍵が見つかりません\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "これは失効証明書でこちらのOpenPGP鍵に対するものです:"
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
#, fuzzy
#| msgid ""
#| "Use it to revoke this key in case of a compromise or loss of\n"
@@@ -6272,7 -4977,6 +6346,7 @@@ msgstr "
"しかし、秘密鍵がまだアクセス可能である場合、新しい失効証明書を生成し、\n"
"失効の理由をつける方がよいでしょう。"
- #: g10/revoke.c:576
++#: g10/revoke.c:575
#, fuzzy
#| msgid ""
#| "To avoid an accidental use of this file, a colon has been inserted\n"
@@@ -6287,13 -4991,11 +6361,13 @@@ msgstr "
"入されます。\n"
"この失効証明書を使う前にはテクスト・エディタでこのコロンを削除してください。"
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "失効証明書を作成。\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, c-format
msgid "secret key \"%s\" not found\n"
msgstr "秘密鍵\"%s\"が見つかりません\n"
@@@ -6301,21 -5003,17 +6375,21 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr "'%s'は以下の複数の秘密鍵にマッチします:\n"
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, c-format
msgid "error searching the keyring: %s\n"
msgstr "鍵リング探索エラー: %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "この鍵に対する失効証明書を作成しますか? (y/N) "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6336,90 -5034,72 +6410,90 @@@ msgstr "
"る\n"
"場所にデータをおくことがあります!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "失効の理由を選択してください:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "キャンセル"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(ここではたぶん%dを選びたいでしょう)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "予備の説明を入力。空行で終了:\n"
- #: g10/revoke.c:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "失効理由: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(説明はありません)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "よろしいですか? (y/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "弱い鍵ができました - 再実行\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "共通鍵暗号方式の弱い鍵を回避することができません。%d回試みました!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "%s 鍵 %s は安全でない(%zuビット)ハッシュを使用しています\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
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:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "*警告*: 署名のダイジェストが、メッセージと衝突します\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "*警告*: 署名副鍵%sは、相互証明されてません\n"
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "詳細は%sをご覧ください\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "*警告*: 無効な相互証明が、署名副鍵%sにあります\n"
- #: g10/sig-check.c:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "公開鍵%sは、署名よりも%lu秒新しいものです\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "公開鍵%sは、署名よりも%lu秒新しいものです\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6429,7 -5109,6 +6503,7 @@@ msgid_plural "
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr[0] "鍵%sは%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6438,55 -5117,45 +6512,55 @@@ msgid_plural "
"key %s was created %lu days in the future (time warp or clock problem)\n"
msgstr[0] "鍵%sは%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "*注意*: 署名鍵%sは%sに期限切れとなります\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "*注意*: 鍵 %s は失効済みです\n"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "不明のクリティカル・ビットにより、鍵%sの署名を不正とみなします\n"
- #: g10/sig-check.c:801
++#: g10/sig-check.c:1043
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "鍵%s: 副鍵失効署名にたいする副鍵がありません\n"
- #: g10/sig-check.c:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "鍵%s: 副鍵対応への署名にたいする副鍵がありません\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr "*警告*: 表記を%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr "*警告*: ポリシーURLを%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr "*警告*: 優先鍵サーバURLを%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s署名。署名者:\"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6494,40 -5163,32 +6568,40 @@@ msgstr "
"*警告*: ダイジェスト・アルゴリズム %s (%d) の強制が、受取人の優先指定と対立し"
"ます\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "署名:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s暗号化を使用します\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"セキュアでないというフラグが鍵には設定されていません。\n"
"偽物乱数生成器とはいっしょに使えません!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\"をスキップします: 重複\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "スキップ: 秘密鍵はもうあります\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "これはPGPの生成したElgamal鍵で、署名用には安全ではありません!"
- #: g10/tdbdump.c:58 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "信用レコード%lu, 型%d: 書き込みに失敗しました: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6536,336 -5197,270 +6610,336 @@@ msgstr "
"# 指定された信用度の一覧です 作成日時: %s\n"
"# (\"gpg --import-ownertrust\" で復旧することができます)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, c-format
msgid "error in '%s': %s\n"
msgstr "'%s'でエラー: %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "行が長すぎます"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "コロンがありません"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "無効なフィンガープリント"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "所有者信用度がありません"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "'%s'で信用レコードの検索エラー: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, c-format
msgid "read error in '%s': %s\n"
msgstr "'%s'で読み込みエラー: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "信用データベース: 同期に失敗しました: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "'%s'のロックを作成できません\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, c-format
msgid "can't lock '%s'\n"
msgstr "'%s'がロックできません\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信用データベース レコード%lu: シークに失敗しました: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信用データベース レコード%lu: 書き込みに失敗しました (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "信用データベースのトランザクションが大きすぎます\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
- #, c-format
- msgid "can't access '%s': %s\n"
- msgstr "'%s'にアクセスできません: %s\n"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: ディレクトリがありません!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "'%s'にアクセスできません: %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: バージョン・レコードの作成に失敗しました: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: 無効な信用データベースを作成\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: 信用データベースができました\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
msgid "Note: trustdb not writable\n"
msgstr "*注意*: 信用データベースが、書き込み不能です\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: 無効な信用データベース\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: ハッシュ表の作成に失敗しました: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: バージョン・レコードの更新エラー: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: バージョン・レコードの読み込みエラー: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: バージョン・レコードの書き込みエラー: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信用データベース: シークに失敗しました: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信用データベース: 読み込みに失敗しました (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: 信用データベース・ファイルではありません\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: レコード番号%lu番のバージョン・レコード\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: 無効なファイル・バージョン%d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: 空きレコードの読み込みエラー: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: ディレクトリ・レコードの書き込みエラー: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: レコードの初期化に失敗しました: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: レコードの追加に失敗しました: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "エラー: 信用データベースが壊れています。\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "%d文字以上の長さのテキスト行は、取り扱えません\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "入力行の長さが%d文字を超えています\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "標準オプションを送信エラー: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "サポートされていないアルゴリズム: %s"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "データ送信エラー: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "base64エンコーディングの書き込みエラー: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "リーダ・オブジェクトの初期化エラー: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "'%s'を開く際、エラー: %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "データ送信エラー: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "公開鍵%sが見つかりません: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
#| msgid "error setting OCSP target: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "OCSPターゲットの設定エラー: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "応答IDの取得エラー: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "有効性: %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "保存されたフラグの取得エラー: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "鍵の一覧"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "メッセージ・ダイジェストを表示"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -6874,166 -5469,147 +6948,178 @@@ msgstr[0] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "パイプの作成エラー: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "メッセージ・ダイジェストを表示"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "データ送信エラー: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "'%s'は、有効な大型鍵IDでありません\n"
- #: g10/trustdb.c:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "鍵%s: 信用する鍵として受理しました\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "鍵%sが信用データベースに複数あります\n"
- #: g10/trustdb.c:295
++#: g10/trustdb.c:294
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "鍵%s: 信用される鍵の公開鍵がありません - スキップします\n"
- #: g10/trustdb.c:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "鍵%sを究極的に信用するよう記録しました\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "信用レコード%lu, リクエスト型%d: 読み込みに失敗しました: %s\n"
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "信用レコード%luが要求された型%dではありません\n"
- #: g10/trustdb.c:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "trustdbを下記のコマンドで再生成することを試すことができます:\n"
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr "もし、それがうまくいかなかったら、マニュアルをご覧ください\n"
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "不明の信用モデル (%d) は使えません - %s信用モデルを仮定\n"
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "%s信用モデルを使用\n"
@@@ -7042,7 -5617,6 +7128,7 @@@
msgid "no need for a trustdb check\n"
msgstr "信用データベースの検査は、不要です\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "次回の信用データベース検査は、%sです\n"
@@@ -7088,36 -5654,29 +7174,36 @@@ msgstr "究極的に信用する鍵が�
msgid "public key of ultimately trusted key %s not found\n"
msgstr "究極的に信用する鍵%sの公開鍵が見つかりません\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, 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:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
"信用データベースのバージョン・レコードが更新できません: 書き込みに失敗しまし"
"た: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "未定義"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "断じてなし"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "まぁまぁ"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "充分"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "究極"
@@@ -7129,39 -5688,30 +7215,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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "10 translator see trust.c:uid_trust_string_fixed"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ 失効 ]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[期限切れ]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ 不明 ]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[ 未定義 ]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[まぁまぁ]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ 充分 ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ 究極 ]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7171,12 -5721,10 +7257,12 @@@ msgstr "
"(.sigや.asc)がコマンド行の最初でなければ\n"
"ならないことを念頭においてください。\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "入力の%u行目が長すぎるか、LFがないようです\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "fd %dが開けません: %s\n"
@@@ -7491,7 -5971,6 +7577,7 @@@ msgstr "|N|初期の新しいPIN
msgid "run in multi server mode (foreground)"
msgstr "マルチ・サーバ・モード(フォアグラウンド)で実行"
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|デバッグ・レベルをLEVELとします"
@@@ -7630,9 -6079,6 +7716,9 @@@ msgstr "マッチする証明書の数
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "dirmngrのキャッシュだけの鍵探索に失敗しました: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "keyDBハンドルの確保に失敗しました\n"
@@@ -8118,7 -6459,6 +8204,7 @@@ msgstr "(暗号化されたメッセー
msgid "certificate '%s' not found: %s\n"
msgstr "証明書'%s'が見つかりません: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "keyboxのロックのエラー: %s\n"
@@@ -8142,123 -6478,93 +8228,123 @@@ msgstr "証明書'%s'の削除に失敗
msgid "no valid recipients given\n"
msgstr "有効な受け取り手が指定されていません\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "外部鍵を一覧する"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "証明書のチェインを表示する"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "証明書をインポートする"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "証明書をエクスポートする"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "スマートカードを登録する"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "dirmngrにコマンドを渡す"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "gpg-protect-toolを起動する"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "base-64形式の出力を作成"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "PEMフォーマットの入力を仮定する"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "base-64フォーマットの入力を仮定する"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "バイナリ・フォーマットの入力を仮定する"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "決してCRLを調べない"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "OCSPを用いて有効性を確認する"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|インクルードする証明書の数"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|FILE|ポリシー情報をFILEから取得する"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "証明書ポリシーをチェックしない"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "紛失している発行者証明書を取得する"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "端末をまったく使わない"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|FILE|サーバ・モードのログをFILEに書き出す"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|監査ログをFILEに書き出す"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "バッチ・モード: なにもユーザに問い合わせない"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "ほとんどの設問にyesを仮定する"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "ほとんどの設問にnoを仮定する"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FILE|鍵リングを鍵リングのリストに追加"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|USER-IDをデフォルトの秘密鍵として使う"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|このキーサーバを鍵の検索に使う"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|暗号アルゴリズムにNAMEを使用"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|ダイジェスト・アルゴリズムにNAMEを使用"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "使い方: @GPGSM@ [オプション] [ファイル] (ヘルプは -h)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8268,46 -6574,37 +8354,46 @@@ msgstr "
"S/MIMEプロトコルを用いて、署名、検査、暗号化や復号を行います\n"
"デフォルトの操作は、入力データに依存します\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "*注意*:'%s'に対して暗号化できません: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "不明の検証モデル '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: ホスト名が指定されていません\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: ユーザなしに与えられたパスワード\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: この行はスキップ\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "共通証明書のインポート・エラー: %s\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "'%s'を用いて署名できません: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "無効なコマンド (暗黙のコマンドはありません)\n"
@@@ -8324,7 -6618,6 +8410,7 @@@ msgstr "証明書の保存に失敗し�
msgid "basic certificate checks failed - not imported\n"
msgstr "基本証明書チェックが失敗しました - インポートされませんでした\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "保存されたフラグの取得エラー: %s\n"
@@@ -8339,31 -6630,25 +8425,31 @@@ msgstr "証明書のインポート・�
msgid "error reading input: %s\n"
msgstr "入力読み込みエラー: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "フィンガープリントの取得に失敗しました\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "既存の証明書の検索の問題: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "書き込み可能keyDBの判定エラー: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "証明書保存エラー: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "証明書の再検索の問題: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "フラグの保存エラー: %s\n"
@@@ -8548,7 -6800,6 +8634,7 @@@ msgstr "永続的にロードされる�
msgid " runtime cached certificates: %u\n"
msgstr "実行時キャッシュ証明書の数: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
msgid "certificate already cached\n"
msgstr " すでにキャッシュされた証明書\n"
@@@ -8556,8 -6806,6 +8642,8 @@@
msgid "certificate cached\n"
msgstr "キャッシュされた証明書\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, c-format
msgid "error caching certificate: %s\n"
msgstr "証明書のキャッシュのエラー: %s\n"
@@@ -9145,12 -7270,10 +9231,12 @@@ msgstr "証明書はPEM形式を期待�
msgid "force the use of the default OCSP responder"
msgstr "デフォルトOCSP応答の使用を強制します"
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
"使い方: dirmngr-client [オプション] [証明書ファイル|パターン] (ヘルプは -h)\n"
- #: dirmngr/dirmngr-client.c:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9162,77 -7285,61 +9248,77 @@@ msgstr "
"プロセスは証明書が有効の場合、0を返し、有効でない場合、1 を返す。\n"
"一般の失敗の場合、そのほかのエラーコードを返す\n"
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "stdinから証明書読み込みエラー: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "'%s'から証明書の読み込みエラー: %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr "証明書は意味のあるものとしては大きすぎます\n"
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, c-format
msgid "can't connect to the dirmngr: %s\n"
msgstr "dirmngrへ接続できません: %s\n"
- #: dirmngr/dirmngr-client.c:327
++#: dirmngr/dirmngr-client.c:333
#, c-format
msgid "lookup failed: %s\n"
msgstr "検索に失敗しました: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "CRL'%s'の読み込みが失敗しました: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr "dirmngr daemonが起動され動いています\n"
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "証明書の検証に失敗しました: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
msgid "certificate is valid\n"
msgstr "証明書は正しいです\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
msgid "certificate has been revoked\n"
msgstr "証明書は失効済みです\n"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, c-format
msgid "certificate check failed: %s\n"
msgstr "証明書の検査に失敗しました: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr "ステイタス'%s'を取得しました\n"
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "base64エンコーディングの書き込みエラー: %s\n"
- #: dirmngr/dirmngr-client.c:685
++#: dirmngr/dirmngr-client.c:702
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "サポートされていない問い合わせ: '%s'\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr "絶対ファイル名がきます\n"
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr "'%s'を検索します\n"
@@@ -9378,12 -7451,10 +9464,12 @@@ msgstr "使い方: %s [オプション
msgid "colons are not allowed in the socket name\n"
msgstr "コロンはソケット名に許されません\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの取得の失敗: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの処理に失敗: %s\n"
@@@ -9858,76 -7827,60 +9944,76 @@@ msgstr "OSCPレスポンダは現在で
msgid "OCSP responder returned an too old status\n"
msgstr "OSCPレスポンダは古すぎるステイタスを返しました\n"
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s)が失敗しました: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr "ldapserverがありません"
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr "serialnoがcert IDにありません"
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquireに失敗しました: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url が失敗しました: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, c-format
msgid "error sending data: %s\n"
msgstr "データ送信エラー: %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch が失敗しました: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert が失敗しました: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d を越えました\n"
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "制御構造を確保できません: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "assuanコンテクストの確保に失敗しました: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "サーバの初期化に失敗しました: %s\n"
- #: dirmngr/server.c:2438
++#: dirmngr/server.c:2437
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "Assuanで登録コマンドに失敗しました: %s\n"
- #: dirmngr/server.c:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept の問題: %s\n"
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuanの処理が失敗しました: %s\n"
diff --cc po/nb.po
index d060dbc,970241e..f5ad6c2
--- 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: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+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"
@@@ -103,8 -87,6 +103,8 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "ugyldig passfrase"
@@@ -160,25 -131,11 +160,25 @@@ msgstr "ugyldig passfrase
msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, 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:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
#, 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:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
#, fuzzy
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -395,8 -313,6 +395,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "endre passfrasen"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -406,278 -322,207 +406,283 @@@ msgstr "
"Valg:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "fyldig output"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "v�re noenlunde stille"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "s�ke etter n�kler p� en n�kkelserver"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "ikke oppdat�r tillitsdatabasen etter import"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
msgid "|NAME|accept some commands via NAME"
msgstr "|NAVN|kryptere for NAVN"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
msgid "enable ssh support"
msgstr ""
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr ""
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
- #: agent/gpg-agent.c:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "katalogen �%s� ble opprettet\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
+
++#: agent/gpg-agent.c:1964
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) mislyktes in %s: %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "kan ikke opprette katalogen �%s�: %s\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: hoppet over: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr ""
@@@ -692,8 -535,6 +697,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -542,6 +706,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -713,43 -551,35 +718,43 @@@ msgstr "
"Valg:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr ""
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "cancel|cancel"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
@@@ -813,8 -633,6 +818,8 @@@ msgstr "
msgid "Yes"
msgstr "ja"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -844,28 -659,23 +849,28 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "endre passfrasen"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -873,19 -683,16 +878,19 @@@
"%%0A?"
msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "innkoble en n�kkel"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -923,53 -723,42 +928,57 @@@ msgstr "kryptert med en ukjent algoritm
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "ikke st�ttet"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "feil ved lesing av �%s�: %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "oppdatering mislyktes: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't close `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -983,15 -770,16 +992,20 @@@ msgstr "
msgid "problem setting the gpg-agent options\n"
msgstr ""
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr ""
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr ""
++#: common/simple-pwquery.c:697
+ #, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr ""
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr ""
@@@ -1061,17 -835,18 +1075,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 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"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1399,7 -1107,6 +1418,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "ikke tvunget"
@@@ -1409,22 -1115,14 +1428,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "ugyldige listevalg\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "du fant en feil ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "signering mislyktes: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
@@@ -1463,167 -1154,134 +1477,176 @@@ msgstr "fant ikke offentlig n�kkel %s:
msgid "waiting for lock %s...\n"
msgstr "venter p� l�sing av �%s� ...\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "armor: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "ugyldig armorheader: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "armorheader: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "ugyldig clearsigheader\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "armorheader: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "n�stede klartekstsignaturer\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "uforventet armering:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "ugyldig bindestrekbeskyttet linje: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "hoppet over ugyldig radix64-tegn %02x\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "for tidlig eof (ingen CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "for tidlig eof (i CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "misdannet CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-feil; %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "for tidlig eof (i trailer)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "feil i trailerlinje\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "ingen gyldig OpenPGP-data funnet.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ugyldig armor: linje lengre enn %d tegn\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"quoted printable-tegn i armor - antakelig har en MTA med feil blitt brukt\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, c-format
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr ""
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr ""
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr ""
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr ""
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr ""
+
++#: g10/build-packet.c:1241
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
#, fuzzy
msgid "WARNING: invalid notation data found\n"
msgstr "ingen gyldig OpenPGP-data funnet.\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr ""
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Tast inn passfrase: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "ADVARSEL: %s overstyrere %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnummer %s oppdaget\n"
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "kan ikke gj�re dette i batchmodus\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
msgid "Reset Code not or not anymore available\n"
msgstr ""
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ditt valg? "
@@@ -1685,21 -1329,11 +1708,16 @@@ msgstr "URL for � hente offentlig n�kke
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:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
@@@ -1790,13 -1405,10 +1808,13 @@@ msgstr "Hvilken n�kkelst�rrelse vil du
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: 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:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1855,9 -1457,6 +1873,9 @@@ msgstr " (2) Krypteringsn�kkel\n
msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsn�kkel\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Ugyldig valg.\n"
@@@ -1891,7 -1484,6 +1909,7 @@@ msgstr "Signere den? (j/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "avslutte denne menyen"
@@@ -1899,7 -1490,6 +1917,7 @@@
msgid "show admin commands"
msgstr "vise admin-kommandoer"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "vise denne hjelpen"
@@@ -1975,125 -1547,96 +1993,125 @@@ msgstr "Admin-kommandoer er tillatt\n
msgid "Admin commands are not allowed\n"
msgstr "Admin-kommandoer er ikke tillatt\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Ugyldig kommando (pr�v �help�)\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output virker ikke for denne kommandoen\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "kan ikke �pne �%s�\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "feil ved lesing av n�kkelblokk: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(med mindre du angir n�kkelen ved hjelp av fingeravtrykk)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
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:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "Slette denne n�kkelen fra n�kkelknippet? (j/N)"
- #: g10/delkey.c:159
++#: g10/delkey.c:158
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:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "bad key"
msgid "key"
msgstr "ugyldig n�kkel"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Offentlig n�kkel: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "nullstilt informasjon om eiertillit\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
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"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "bruker cipher %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "�%s� er allerede komprimert\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "ADVARSEL: �%s� er en tom fil\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "leser fra �%s�\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2101,7 -1644,6 +2119,7 @@@ msgstr "
"ADVARSEL: p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens "
"preferanser\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2110,40 -1652,33 +2128,40 @@@ msgstr "
"ADVARSEL: tvang av kompresjonsalgoritme %s (%d) bryter med mottakerens "
"preferanser\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, 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:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "du kan ikke bruke %s i %s modus\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s kryptert for: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "du kan ikke bruke %s i %s modus\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s krypterte data\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "kryptert med en ukjent algoritme %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ADVARSEL: meldingen er kryptert med en svak n�kkel for den symmetriske "
"cipher.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problem ved h�ndtering av kryptert pakke\n"
@@@ -2205,131 -1729,103 +2223,131 @@@ 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:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "eksportere signaturer som er markert som bare-lokale"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr ""
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: hoppet over: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: ingenting eksportert\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[Brukerid ikke funnet]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "ugyldige listevalg\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "feil med �%s�: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "CA-fingeravtrykk: "
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "unusable secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "ubrukelig hemmelig n�kkel"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "unusable secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "ubrukelig hemmelig n�kkel"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "|[fil]|lage en signatur"
@@@ -2339,11 -1834,9 +2357,11 @@@
msgid "make a clear text signature"
msgstr "|[fil]|lage en klartekstsignatur"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "lage en adskilt signatur"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "kryptere data"
@@@ -2351,15 -1843,12 +2369,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "kryptering med bare symmetrisk cipher"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekryptere data (standard)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "bekrefte en signatur"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "liste n�kler"
@@@ -2371,15 -1858,12 +2389,15 @@@ msgstr "liste n�kler og signaturer
msgid "list and check key signatures"
msgstr "vise og sjekke n�kkelsignaturer"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "liste n�kler og fingeravtrykk"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "liste hemmelige n�kler"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "generere et nytt n�kkelpar"
@@@ -2403,7 -1883,6 +2421,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "generere et opphevingssertifikat"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
@@@ -2435,7 -1908,6 +2453,7 @@@ msgstr "signere en n�kkel lokalt
msgid "sign or edit a key"
msgstr "signere eller redigere en n�kkel"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "endre passfrasen"
@@@ -2485,24 -1946,19 +2503,24 @@@ msgstr "oppdatere tillitsdatabasen
msgid "print message digests"
msgstr "|algo [filer]|skrive meldingsdigester"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "lage ASCII-beskyttet output"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAVN|kryptere for NAVN"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "bruke denne brukeriden for signering eller dekryptering"
@@@ -2516,12 -1970,10 +2534,12 @@@ msgstr "|N|sette kompresjonsniv� til N
msgid "use canonical text mode"
msgstr "bruk kanonisk tekstmodus"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "leser valg fra �%s�\n"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "ikke gj�r noen endringer"
@@@ -2533,7 -1983,6 +2551,7 @@@ msgstr "sp�r f�r overskriving
msgid "use strict OpenPGP behavior"
msgstr "bruk streng OpenPGP-oppf�rsel"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2541,7 -1990,6 +2559,7 @@@ msgstr "
"@\n"
"(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2561,13 -2009,11 +2579,13 @@@ msgstr "
" --list-keys [navn] vise n�kler\n"
" --fingerprint [navn] vise fingeravtrykk\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2582,7 -2028,6 +2600,7 @@@ msgstr "
"signere, sjekke, kryptere eller dekryptere\n"
"standard operasjon avhenger av inputdata\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2590,74 -2035,60 +2608,74 @@@ msgstr "
"\n"
"St�ttede algoritmer:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Offentlig n�kkel: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Cipher: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Kompresjon: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "bruksm�te: gpg [valg] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "motstridende kommandoer\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2665,7 -2096,6 +2683,7 @@@ msgstr "
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen "
"�%s�\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1537
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2675,14 -2105,12 +2693,14 @@@ msgstr "
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
"�%s�\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2690,7 -2118,6 +2708,7 @@@ msgstr "
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
"�%s�\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1549
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2701,509 -2128,398 +2719,509 @@@ msgstr "
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
"konfigurasjonsfilen �%s�\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "ukjent konfigurasjonspunkt �%s�\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, 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:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr ""
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "vise navnet til n�kkelknippene i n�kkellister"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr ""
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "utkoble en n�kkel"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "ukjent valg �%s�\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "ukjent valg �%s�\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "ugyldig hashalgoritme �%s�\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke parse n�kkelserverens URL\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "ugyldige valg for n�kkelserver\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importvalg\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "ugyldige importvalg\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportvalg\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "ugyldige eksportvalg\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listevalg\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "ugyldige listevalg\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr ""
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr ""
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
msgid "show only the primary user ID in signature verification"
msgstr ""
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige valg for bekreftelse\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "ugyldige valg for bekreftelse\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke sette exec-path til %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overstyrere %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s er ikke tillatt sammen med %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er ikke fornuftig med %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr ""
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "valg digestalgoritme er ugyldig\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "valgt kompresjonsalgoritme er ugyldig\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed m� v�re st�rre enn 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neede m� v�re st�rre enn 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "ugyldig standard preferanser\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "ugyldig personlig cipherpreferanser\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "ugyldig personlig digestpreferanser\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "ugyldig personlig kompresjonspreferanser\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker ikke enn� med %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [filnavn]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, 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:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key brukerid"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key brukerid"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key brukerid [kommandoer]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key brukerid"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sending til n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "mottak fra n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "n�kkeleksport mislyktes: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "n�kkeleksport mislyktes: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "s�k p� n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "refresh p� n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ugyldig hashalgoritme �%s�\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, 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:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[filnavn]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Sett i gang og tast inn meldingen din ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
@@@ -3216,7 -2530,6 +3234,7 @@@ msgstr "hent n�klene fra dette n�kkelkn
msgid "make timestamp conflicts only a warning"
msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|skrive statusinfo til denne FD"
@@@ -3242,326 -2551,260 +3260,326 @@@ msgstr "
msgid "No help available for '%s'"
msgstr ""
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "ikke oppdat�r tillitsdatabasen etter import"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "ikke oppdat�r tillitsdatabasen etter import"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr ""
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "hopper over blokk av typen %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu n�kler behandlet hittil\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antall behandlet: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr "nye n�kler som ble hoppet over: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "nye n�kler som ble hoppet over: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " uten brukerider: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importert: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " uendret: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nye brukerider: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nye undern�kler: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " nye signaturer: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nye n�kkelopphevinger: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " leste hemmelige n�kler: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importerte hemmelige n�kler: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " uforandrede hemmelige n�kler: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ikke importert: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " oppryddete signaturer: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " oppryddete brukerider: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " �%s� preferanse for digestalgoritme %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "n�kkel %s: ingen brukerid\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "hoppet over �%s�: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "n�kkel %s: PKS-undern�kkel reparert\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "n�kkel %s: akseptert ikke-selvsignert brukerid �%s�\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "n�kkel %s: ingen gyldig brukerid\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "dette kan skyldes en manglende selvsignatur\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "n�kkel %s: offentlig n�kkel ikke funnet: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, 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:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "n�kkel %s: �%s� %d nye brukerider\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "n�kkel %s: �%s� 1 ny signatur\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "n�kkel %s: �%s� %d nye brukerider\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "n�kkel %s: �%s� %d nye brukerider\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "n�kkel %s: �%s� ikke endret\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "n�kkel %s: hemmelig n�kkel importert\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, 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:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "import av hemmelig n�kkel er ikke tillatt\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3576,198 -2819,179 +3594,221 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "n�kkel %s: ingen brukerid for signatur\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "n�kkel %s: hoppet over undern�kkel\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
- #: g10/import.c:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "n�kkelknippet �%s� ble opprettet\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "n�kkelknippet �%s� ble opprettet\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "n�kkelblokkressurs �%s�: %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "feil med �%s�: %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr ""
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[oppheving]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[selvsignatur]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d ubrukelige signaturer\n"
- msgstr[1] "%d ubrukelige signaturer\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "kortet st�tter ikke digestalgoritme %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "God signatur fra �%s�"
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "skipped \"%s\": %s\n"
+ msgid "key %s:\n"
+ msgstr "hoppet over �%s�: %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "n�kkel: %s: �%s� %d nye signaturer\n"
+ msgstr[1] "n�kkel: %s: �%s� %d nye signaturer\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3775,23 -2999,25 +3816,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signatur ble ikke sjekket p� grunn av en manglende n�kkel\n"
msgstr[1] "1 signatur ble ikke sjekket p� grunn av en manglende n�kkel\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 signatur ble ikke sjekket p� grunn av en feil\n"
- msgstr[1] "1 signatur ble ikke sjekket p� grunn av en feil\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d ubrukelige signaturer\n"
+ msgstr[1] "%d ubrukelige signaturer\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
- msgstr[1] "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "God signatur fra �%s�"
+ msgstr[1] "God signatur fra �%s�"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3802,67 -3028,52 +3849,67 @@@ msgstr "
"andre brukeres n�kler (ved � se p� pass, sjekke fingeravtrykk fra\n"
"forskjellige kilder, osv.)\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Jeg stoler marginalt\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Jeg stoler fullt\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Brukerid �%s� er opphevet."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Kunne ikke signere.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Brukerid �%s� er utg�tt."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Brukeriden �%s� er ikke selvsignert."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Brukeriden �%s� er signerbar."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "Signere den? (j/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3871,11 -3082,9 +3918,11 @@@ msgstr "
"Selvsignaturen p� �%s�\n"
"er en PGP 2.x-aktig signatur.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3884,11 -3093,9 +3931,11 @@@ msgstr "
"Din n�v�rende signatur p� �%s�\n"
"er utg�tt.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3897,43 -3104,34 +3944,43 @@@ msgstr "
"Din n�v�rede signatur p� �%s�\n"
"er en lokal signatur.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "�%s� var allerede signert av n�kkelen %s\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Vil du likevel signere den igjen? (j/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Ingenting � signere med n�kkelen %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Denne n�kkelen er utg�tt!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Denne n�kkelen utg�r den %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3943,33 -3141,27 +3990,33 @@@ msgstr "
"tilh�rer den overnevnte personen? Tast inn �0� dersom du ikke vet\n"
"svaret.\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jeg vil ikke svare.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, 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:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jeg har gjort en vanlig sjekk.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
#, 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:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3978,225 -3170,167 +4025,221 @@@ msgstr "
"Er du virkelig sikker p� at du vil signerere denne n�kkelen med din\n"
"n�kkel �%s� (%s)\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Dette vil v�re en selvsignatur.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "Signaturen vil bli markert som ikke-eksporterbar.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "Signaturen vil bli markert som ikke-opphevbar.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
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:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "Jeg har sjekket denne n�kkelen p� vanlig m�te.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Virkelig signere? (j/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "signering mislyktes: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "flytter en n�kkelsignatur til den rette plassen\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "lagre og avslutte"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "vise n�kkelens fingeravtrykk"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
#| msgid "show this help"
msgid "show the keygrip"
msgstr "vise denne hjelpen"
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "liste n�kler og brukerider"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "velger brukerid N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "velger brukerid N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "sjekke signaturer"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "signerere utvalgte brukerider lokalt"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "signere utvalgte brukerider med en tillitssignatur"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "legge til en brukerid"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "legge til en fotoid"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "slette utvalgte brukerider"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "legge til en undern�kkel"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "slette utvalgte undern�kler"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "legge til en opphevingsn�kkel"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "slette signaturene fra de utvalgte brukeridene"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
msgid "change the expiration date for the key or selected subkeys"
msgstr ""
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "markere den valgte brukeriden som den prim�re"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "liste preferanser (ekspert)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "liste preferanser (fyldig)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "sette preferanseliste for de valgte brukeridene"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
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:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "sette en notasjon for de valgte brukeridene"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "endre passfrasen"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "endre eiertilliten"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "oppheve signaturene p� de valgte brukeridene"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "oppheve utvalgte brukerider"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "oppheve n�kkel eller utvalgte undern�kler"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "innkoble en n�kkel"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "utkoble en n�kkel"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "vise utvalgte fotoider"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Hemmelig n�kkel er tilgjengelig\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4204,319 -3338,251 +4247,325 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "N�kkelen er opphevet."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "Virkelig signerere alle brukerider? (j/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, 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:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tips: Velg brukeriden som skal signeres\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Ukjent signaturtype �%s�\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Du m� velge minst en brukerid.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Du kan ikke slette den siste brukeriden!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Du m� velge minst en n�kkel.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, 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:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Du m� velge minst en n�kkel.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
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:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vil du virkelig slette denne n�kkelen? (j/N) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "Virkelig oppheve denne brukeriden? (j/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
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:2099
++#: g10/keyedit.c:2565
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:2101
++#: g10/keyedit.c:2567
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "sette preferanseliste til:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Virkelig oppdatere preferansene? (j/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Lagre endringene? (j/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Avslutte uten � lagre? (j/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
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:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "ugyldig fingeravtrykk"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "ugyldig verdi\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Det finnes ingen slik brukerid.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, 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:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "S�rtrekk: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "Notasjoner: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(sensitiv)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "opprettet: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "opphevet: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "utgikk: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "utg�r: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "bruksm�te: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "tillit: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "gyldighet: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Denne n�kkelen har blitt utkoblet"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "opphevet"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "utg�tt"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
msgid "You may want to change its expiration date too.\n"
msgstr ""
- #: g10/keyedit.c:3565
++#: g10/keyedit.c:4084
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:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
- #: g10/keyedit.c:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Slette denne gode signaturen? (j/N/a)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr ""
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr ""
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4524,75 -3590,60 +4573,75 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Slettet %d signatur.\n"
msgstr[1] "Slettet %d signatur.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Ingen ble slettet.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "ugyldig"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "brukerid �%s�: allerede renset\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "n�kkel: %s: �%s� %d nye signaturer\n"
msgstr[1] "n�kkel: %s: �%s� %d nye signaturer\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "brukerid �%s�: allerede renset\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "brukerid �%s�: allerede renset\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
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:3863
++#: g10/keyedit.c:4382
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
- #: g10/keyedit.c:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr ""
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3920
++#: g10/keyedit.c:4439
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
- #: g10/keyedit.c:3942
++#: g10/keyedit.c:4461
msgid "this key has already been designated as a revoker\n"
msgstr ""
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
- #: g10/keyedit.c:3967
++#: g10/keyedit.c:4485
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:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4603,225 -3654,175 +4652,225 @@@ msgstr "
"Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
"N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr ""
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr ""
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
- #: g10/keyedit.c:4144
++#: g10/keyedit.c:4768
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Undern�kkel %s er allerede opphevet.\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr ""
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
- #: g10/keyedit.c:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
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:4557
++#: g10/keyedit.c:5181
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:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr ""
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr ""
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr ""
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr ""
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr ""
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr ""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
- #: g10/keyedit.c:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (ikke-eksporterbar)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denne signaturen utgikk den %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr ""
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr ""
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (ikke-opphevbar)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr ""
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr ""
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr ""
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "ingen hemmelig n�kkel\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "brukerid �%s� er allerede opphevet\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "N�kkelen %s er allerede opphevet.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undern�kkel %s er allerede opphevet.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
msgstr "preferansen %s er duplisert\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "for mange cipher-preferanser\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "for mange digest-preferanser\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "for mange kompresjons-preferanser\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "ugyldig oppf�ring �%s� i preferansestreng\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "skriver direkte signatur\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "skriver selvsignatur\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "skriver n�kkelbindende signatur\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Signere"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Bekrefte"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Kryptere data"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Autentisere"
@@@ -4839,156 -3840,125 +4888,156 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "SsKkAaQq"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr ""
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Vennligst velg hvilken type n�kkel du vil ha:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA og ElGamal (standard)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA og ElGamal (standard)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (bare signering)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (bare signering)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (bare kryptering)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (bare kryptering)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (sette dine egne muligheter)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (sette dine egne muligheter)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA og ElGamal (standard)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (bare signering)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (sette dine egne muligheter)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (bare kryptering)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (2) Krypteringsn�kkel\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr ""
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr ""
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "�nsket n�kkelst�rrelse er %u bits\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "rundet opp til %u bits\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Vennligst velg hvilken type n�kkel du vil ha:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5004,7 -3974,6 +5053,7 @@@ msgstr "
" <n>m = n�kkelen utg�r om n months\n"
" <n>y = n�kkelen utg�r om n years\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5020,38 -3989,30 +5069,38 @@@ msgstr "
" <n>m = signaturen utg�r om n months\n"
" <n>y = signaturen utg�r om n years\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "N�kkelen er gyldig for? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Signaturen er gyldig for? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "ugyldig verdi\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "N�kkel utg�r ikke i det hele tatt\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "Signaturen utg�r ikke i det hele tatt\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "N�kkel utg�r den %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "Signaturen utg�r den %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5059,11 -4020,9 +5108,11 @@@ msgstr "
"Systemet ditt kan ikke vise datoer etter 2038.\n"
"Likevel vil det bli h�ndtert korrekt opp til 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt (j/N)? "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5074,7 -4033,6 +5123,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5090,50 -4048,39 +5139,50 @@@ msgstr "
" �Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>�\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Fullt navn: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Ugyldig tegn i navn\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Navnet kan ikke starte med et siffer\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Navnet m� v�re minst 5 tegn langt\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Epostadresse: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Ugyldig tegn i kommentar\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5144,7 -4091,6 +5193,7 @@@ msgstr "
" �%s�\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5160,35 -4106,28 +5209,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnKeEeRrAa"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Vennligst korriger feilen f�rst\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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 -4139,10 +5249,12 @@@ msgstr "
"diskene jobbe) under primtallgenereringen; dette gir\n"
"tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "N�kkelgenerering mislyktes: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5213,70 -4150,57 +5262,70 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, 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:3501
++#: g10/keygen.c:3514
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Bruke denne n�kkelen likevel? (j/N) "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "generere en ny n�kkel\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "N�kkelgenereringen ble avbrutt.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr ""
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5286,7 -4210,6 +5335,7 @@@ msgstr "
"sekund�rn�kkel for dette form�let.\n"
# Er dette entallsformen av denne strengen?
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5295,7 -4218,6 +5344,7 @@@ msgstr "
"klokkeproblem)\n"
# Er dette flertallsformen av denne og den forrige strengen?
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5303,7 -4225,6 +5352,7 @@@ msgstr "
"n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
"klokkeproblem)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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"
@@@ -5311,43 -4232,33 +5360,43 @@@ msgstr "
"MERK: opprettelse av undern�kler for v3-n�kler er ikke i samsvar med "
"OpenPGP\n"
- #: g10/keygen.c:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Virkelig opprette? (j/N)"
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr ""
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr ""
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr ""
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr ""
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr ""
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5355,55 -4266,51 +5404,63 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d ubrukelige signaturer\n"
msgstr[1] "%d ubrukelige signaturer\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 signatur ble ikke sjekket p� grunn av en feil\n"
+ msgstr[1] "1 signatur ble ikke sjekket p� grunn av en feil\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "N�kkelknippe"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "hoppet over �%s�: %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Fingeravtrykk for prim�rn�kkel:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Fingeravtrykk for prim�rn�kkel:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Fingeravstrykk for undern�kkel:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " N�kkelfingeravtrykk ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " Serienummer for kort ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "cacher n�kkelknippet �%s�\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5411,14 -4318,12 +5468,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu n�kler cachet s� langt (%lu signaturer)\n"
msgstr[1] "%lu n�kler cachet s� langt (%lu signaturer)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5426,58 -4331,45 +5483,58 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 ubrukelig signatur\n"
msgstr[1] "1 ubrukelig signatur\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr ""
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr ""
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "utkoblet"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5485,463 -4377,369 +5542,463 @@@ msgid_plural "refreshing %d keys from %
msgstr[0] "oppfrisker %d n�kler fra %s\n"
msgstr[1] "oppfrisker %d n�kler fra %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "n�kkelen �%s� ble ikke funnet p� n�kkelserveren\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "ber om n�kkel %s fra %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "ingen handling for n�kkelserver!\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr ""
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, 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:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "merkelig st�rrelse for en kryptert sesjonsn�kkel (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr ""
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "passfrase er generert med en ukjent digest-algoritme %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "offentlig n�kkel er %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "offentlig n�kkel-kryptert data: god DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "kryptert med %u-bit %s-n�kkel, ID %s, opprettet %s\n"
# Do we really need to translate this string.
# The must some bug in the code.
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " �%s�\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "kryptert med %s-n�kkel, ID %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr ""
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr ""
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr ""
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr ""
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr ""
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr ""
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekryptering mislyktes: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "opprinnelig filnavn=�%.*s�\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "ingen signatur ble funnet\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "D�RLIG signatur fra �%s�"
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Utg�tt signatur fra �%s�"
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "God signatur fra �%s�"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr ""
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr ""
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur opprettet %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " bruker %s n�kkel %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "N�kkel tilgjengelig ved: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[usikker]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " aka �%s�"
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Signatur utg�tt %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Signatur utg�r %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "bin�r"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "tekstmodus"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "ukjent"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "ukjent pubkey-algoritme"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr ""
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr ""
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr ""
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr ""
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) mislyktes in %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "ADVARSEL: bruker eksperimentell offentlig n�kkel-algoritme %s\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "lesefeil ved �%s�: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "lesefeil ved �%s�: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr ""
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr ""
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
- #: g10/misc.c:1081
++#: g10/misc.c:1079
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr ""
- #: g10/misc.c:1085
++#: g10/misc.c:1083
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
msgstr ""
- #: g10/misc.c:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr ""
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
msgstr ""
- #: g10/misc.c:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "flertydig valg �%s�\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "ukjent valg �%s�\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "Ukjent signaturtype �%s�\n"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Fila �%s� finnes. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Overskrive (j/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr ""
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Tast inn nytt filnavn"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "skriver til stdout\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "antar at signert data er i �%s�\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "ny konfigurasjonsfil �%s� ble opprettet\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "ADVARSEL: valgene i �%s� er ikke aktive under denne kj�ringen\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr ""
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr ""
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (hovedn�kkelid %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -5954,15 -4752,12 +6011,15 @@@ msgstr "
"�%.*s�\n"
"%u-bit %s n�kkel, ID %s, opprettet %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Tast inn passfrase\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr ""
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -5971,57 -4766,48 +6028,57 @@@ msgstr "
"Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for\n"
"brukeren: �%s�\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
"\n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
"\n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
"\n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr ""
"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
"\n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6074,31 -4852,24 +6131,31 @@@ msgstr "
msgid "unable to display photo ID!\n"
msgstr ""
- #: g10/pkclist.c:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Ingen grunn er angitt"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "N�kkelen er overg�tt"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "N�kkelen har blitt kompromittert"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "N�kkelen er ikke lengre i bruk"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "Brukerid er ikke lengre gyldig"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "grunnen for opphevelse: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "kommentar til opphevelse: "
@@@ -6112,95 -4883,76 +6169,95 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Ingen tillitsverdi tilordnet til:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " aka �%s�\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, 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:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Jeg stoler IKKE p� den\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Jeg stoler fullstendig p� den\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = tilbake til hovedmenyen\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = hopp over denne n�kkelen\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " q = avslutt\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Valget ditt? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Sertifikater som f�rer til en fullstendig betrodd n�kkel:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "Denne n�kkelen tilh�rer sannsynligvis den angitte eieren\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "denne n�kkelen tilh�rer oss\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6210,131 -4962,103 +6267,131 @@@ 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:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "Bruke denne n�kkelen likevel? (j/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "ADVARSEL: Bruker ubetrodd n�kkel!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " Dette kan bety at signaturen er falsk.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Merk: Denne n�kkelen har blitt utkoblet.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Merk: Denne n�kkelen er utg�tt!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ADVARSEL: Vi stoler IKKE p� denne n�kkelen!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen er sannsynligvis et FALSKNERI.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppet over: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: hoppet over: offentlig n�kkel er utkoblet\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: hoppet over: offentlig n�kkel er allerede tilstede\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't close `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "kan ikke lukke �%s�: %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "ugyldig hashalgoritme �%s�\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "ugyldig hashalgoritme �%s�\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6342,167 -5066,131 +6399,167 @@@ msgstr "
"\n"
"Tast inn brukeriden. Avslutt med en blank linje: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Det finnes ingen slik brukerid.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Offentlig n�kkel er utkoblet.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "hoppet over: offentlig n�kkel er allerede satt\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "ukjent standardmottaker �%s�\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "ingen gyldige adressater\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "n�kkel %s: ingen brukerid\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "n�kkel %s: ingen brukerid\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr ""
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr ""
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr ""
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr ""
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, fuzzy, c-format
msgid "can't open signed data '%s'\n"
msgstr "kan ikke �pne �%s�: %s\n"
- #: g10/plaintext.c:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kan ikke �pne �%s�: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr ""
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr ""
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr ""
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr ""
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"p�tvinging av kompresjonsalgoritme %s bryter med mottakerens preferanser\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTIS: hemmelig n�kkel %s utgikk den %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr ""
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "n�kkel %s: ingen brukerid\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr ""
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr ""
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, 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
++#: g10/revoke.c:327
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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr ""
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr ""
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr ""
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, 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:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6511,20 -5199,17 +6568,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "key %s: \"%s\" revocation certificate imported\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6533,22 -5218,18 +6590,22 @@@ msgstr "hemmelig n�kkel �%s� ble ikke f
#. 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:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, 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/revoke.c:712
++#: g10/revoke.c:711
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6559,84 -5240,67 +6616,84 @@@
"your machine might store the data and make it available to others!\n"
msgstr ""
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr ""
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr ""
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
- #: g10/revoke.c:823
++#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
- #: g10/revoke.c:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr ""
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr ""
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Er dette i orden? (j/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "svak n�kkel ble opprettet - pr�ver p� nytt\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"kan ikke unng� svak n�kkel for symmetrisk krypteringsalgorime; pr�vde %d "
"ganger!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr ""
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "vennligst se %s for mer informasjon\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
- #: g10/sig-check.c:275
++#: g10/sig-check.c:277
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "key %s: \"%s\" %d new signatures\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6645,7 -5309,6 +6702,7 @@@ msgstr[0] "n�kkel: %s: �%s� %d nye sign
msgstr[1] "n�kkel: %s: �%s� %d nye signaturer\n"
# Er dette entallsformen av denne strengen?
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6661,7 -5324,6 +6718,7 @@@ msgstr[1] "
"klokkeproblem)\n"
# Er dette entallsformen av denne strengen?
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6675,56 -5337,46 +6732,56 @@@ msgstr[1] "
"n�kkel %s ble opprettet %lu sekund i fremtiden (time warp eller "
"klokkeproblem)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
- #: g10/sig-check.c:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "n�kkel %s: ingen undern�kkel for undern�kkelbindingssignatur\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr ""
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr ""
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s-signatur fra: �%s�\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6732,379 -5384,305 +6789,379 @@@ msgstr "
"ADVARSEL: p�tvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens "
"preferanser\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr ""
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr ""
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "hoppet over �%s�: er duplikat\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr ""
- #: g10/skclist.c:226
++#: g10/skclist.c:225
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
- #: g10/tdbdump.c:58 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr ""
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
"# (Use \"gpg --import-ownertrust\" to restore them)\n"
msgstr ""
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error in '%s': %s\n"
msgstr "feil med �%s�: %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "for lang linje"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "ugyldig fingeravtrykk"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "verdi for eiertillit mangler"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
#| msgid "error finding trust record in `%s': %s\n"
msgid "error finding trust record in '%s': %s\n"
msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "read error in '%s': %s\n"
msgstr "lesefeil ved �%s�: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr ""
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
#| msgid "can't create lock for `%s'\n"
msgid "can't create lock for '%s'\n"
msgstr "kan ikke opprette l�s for �%s�\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
#| msgid "can't lock `%s'\n"
msgid "can't lock '%s'\n"
msgstr "kan ikke l�se �%s�\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr ""
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr ""
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:675
+ #, c-format
+ msgid "%s: directory does not exist!\n"
+ msgstr ""
+
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
msgstr "kan ikke aksere �%s�: %s\n"
- #: g10/tdbio.c:688
- #, c-format
- msgid "%s: directory does not exist!\n"
- msgstr ""
-
- #: g10/tdbio.c:711
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr ""
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr ""
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr ""
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
msgid "Note: trustdb not writable\n"
msgstr "hemmelig n�kkel er ikke tilgjengelig"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr ""
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr ""
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr ""
- #: g10/tdbio.c:853 g10/tdbio.c:879 g10/tdbio.c:897 g10/tdbio.c:917
- #: g10/tdbio.c:952 g10/tdbio.c:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr ""
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr ""
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr ""
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr ""
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr ""
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr ""
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr ""
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr ""
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr ""
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr ""
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr ""
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr ""
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr ""
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr ""
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"St�ttede algoritmer:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
msgid "error initializing TOFU database: %s\n"
msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "feil med �%s�: %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "fant ikke offentlig n�kkel %s: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "feil ved henting av ny PIN: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "gyldighet: %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "feil ved henting av ny PIN: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "liste n�kler"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [filer]|skrive meldingsdigester"
msgstr[1] "|algo [filer]|skrive meldingsdigester"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7114,173 -5692,153 +7171,184 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [filer]|skrive meldingsdigester"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "n�kkel %s: godtatt som betrodd n�kkel\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr ""
- #: g10/trustdb.c:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "n�kkel %s markert som endelig betrodd.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr ""
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr ""
- #: g10/trustdb.c:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7289,7 -5846,6 +7357,7 @@@
msgid "no need for a trustdb check\n"
msgstr ""
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr ""
@@@ -7336,34 -5884,27 +7404,34 @@@ msgstr "
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr ""
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7375,51 -5916,40 +7443,51 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ opphevet]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[ utg�tt]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ ukjent]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[ udef ]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
"should be the first file given on the command line.\n"
msgstr ""
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr ""
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "kan ikke �pne �%s�: %s\n"
@@@ -7748,7 -6210,6 +7816,7 @@@ msgstr "|N|Ny PIN
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7888,9 -6319,6 +7956,9 @@@ msgstr "feil ved opprettelse av passfra
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "klarte ikke � lagre n�kkelen: %s\n"
@@@ -8401,7 -6724,6 +8469,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "feil ved lesing av n�kkelblokk: %s\n"
@@@ -8426,134 -6744,104 +8494,134 @@@ msgstr "sleting av n�kkelblokk mislykte
msgid "no valid recipients given\n"
msgstr "ingen gyldige adressater\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "liste hemmelige n�kler"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "ugyldig sertifikat"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "ugyldig sertifikat"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "ugyldig sertifikat"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "lage ASCII-beskyttet output"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr ""
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "leser valg fra �%s�\n"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr ""
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr ""
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr ""
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "hent n�klene fra dette n�kkelknippet"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "ukjent kryptoalgoritme"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s signatur, digestalgoritme %s\n"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8564,47 -6852,38 +8632,47 @@@ msgstr "
"signere, sjekke, kryptere eller dekryptere\n"
"standard operasjon avhenger av inputdata\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "kan ikke opprette �%s�: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "ukjent valg �%s�\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = hopp over denne n�kkelen\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "kunne ikke parse n�kkelserverens URL\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "kan ikke aksere �%s�: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8622,7 -6898,6 +8690,7 @@@ msgstr "generere et opphevingssertifika
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "feil ved henting av ny PIN: %s\n"
@@@ -8637,32 -6910,26 +8705,32 @@@ msgstr "feil ved opprettelse av passfra
msgid "error reading input: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
@@@ -8839,7 -7073,6 +8907,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "preferansen %s er duplisert\n"
@@@ -8849,8 -7081,6 +8917,8 @@@
msgid "certificate cached\n"
msgstr "preferansen %s er duplisert\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
@@@ -9459,13 -7566,11 +9527,13 @@@ msgstr "ugyldig sertifikat
msgid "force the use of the default OCSP responder"
msgstr ""
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9473,85 -7578,69 +9541,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, fuzzy, c-format
msgid "can't connect to the dirmngr: %s\n"
msgstr "kan ikke �pne n�kkelknippet"
- #: dirmngr/dirmngr-client.c:327
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, 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:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "preferansen %s er duplisert\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "Denne n�kkelen er utg�tt!"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"St�ttede algoritmer:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9707,13 -7762,11 +9775,13 @@@ msgstr "bruksm�te: gpg [valg]
msgid "colons are not allowed in the socket name\n"
msgstr "%s er ikke tillatt sammen med %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, 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:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
@@@ -10216,78 -8167,62 +10284,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "signering mislyktes: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "signering mislyktes: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "sleting av n�kkelblokk mislyktes: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "klarte ikke � lagre n�kkelen: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/pl.po
index 93bf3e7,2b8c12c..808bbdd
--- a/po/pl.po
+++ b/po/pl.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-2.0.20\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2013-05-12 17:25+0200\n"
"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@@ -111,8 -95,6 +111,8 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Has�o:"
@@@ -162,25 -133,11 +162,25 @@@ msgstr "Niepoprawne has�o
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "klucze ssh wi�ksze ni� %d bit�w nie s� obs�ugiwane\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "nie mo�na utworzy� ,,%s'': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
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:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
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"
@@@ -411,8 -329,6 +411,8 @@@ msgstr "Prosz� wprowadzi� has�o do%0Aza
msgid "Please enter the new passphrase"
msgstr "Prosz� wprowadzi� nowe has�o"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -420,136 -336,98 +420,136 @@@ msgstr "
"@Opcje:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 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:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "z dodatkowymi informacjami"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "mniej komunikat�w"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "wyj�cie polece� w stylu sh"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "wyj�cie polece� w stylu csh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "nie odczepianie od konsoli"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "nie przechwytywanie klawiatury i myszy"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "u�ycie pliku loga dla serwera"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|u�ycie PGM jako programu do wprowadzania PIN-u"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|u�ycie PGM jako programu SCdaemon"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "nie u�ywanie SCdaemona"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|connect to Assuan socket NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NAZWA|po��czenie z gniazdem Assuan o tej nazwie"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "ignorowanie ��da� zmiany TTY"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "ignorowanie ��da� zmiany ekranu X"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|przedawnienie pami�tanych PIN-�w po N sekundach"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "nie u�ywanie pami�ci PIN-�w przy podpisywaniu"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "nie zezwalanie na ponowne u�ycie starych hase�"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
#, fuzzy
#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "zezwolenie na predefiniowane has�o"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
msgid "enable ssh support"
msgstr ""
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr ""
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Wywo�anie: gpgconf [opcje] (-h podaje pomoc)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -561,150 -439,118 +561,156 @@@ msgstr "
"Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarz�dzanie kluczem tajnym dla GnuPG\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: 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:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "katalog ,,%s'' utworzony\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Ostrze�enie: niebezpieczne prawa dost�pu do %s ,,%s''\n"
+
++#: agent/gpg-agent.c:1964
#, 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:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, 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:2314
++#: agent/gpg-agent.c:2322
#, 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:2387
++#: agent/gpg-agent.c:2395
#, 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:2392
++#: agent/gpg-agent.c:2400
#, 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:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s zatrzymany\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -721,8 -565,6 +727,8 @@@ msgstr "
"Sk�adnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
"Utrzymuwanie pami�ci hase�\n"
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -730,9 -572,6 +736,9 @@@ msgstr "
"@Polecenia:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -742,11 -581,9 +748,11 @@@ msgstr "
"Opcje:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Wywo�anie: gpg-protect-tool [opcje] (-h podaje pomoc)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -754,22 -591,18 +760,22 @@@ msgstr "
"Sk�adnia: gpg-protect-tool [opcje] [argumenty]\n"
"Narz�dzie do utrzymywania kluczy tajnych\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Prosz� wprowadzi� has�o do odbezpieczenia obiektu PKCS#12."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Prosz� wprowadzi� has�o do zabezpieczenia wa�nego obiektu w systemie GnuPG."
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -777,11 -610,9 +783,11 @@@ msgstr "
"Prosz� wprowadzi� has�o lub PIN\n"
"Potrzebny do zako�czenia tej operacji."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "anulowano\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "b��d podczas pytania o has�o: %s\n"
@@@ -853,8 -674,6 +859,8 @@@ msgstr "
msgid "Yes"
msgstr "Tak"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "Nie"
@@@ -886,12 -702,10 +892,12 @@@ msgstr "Akceptuj
msgid "Wrong"
msgstr "Odrzu�"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr "Uwaga: To has�o nie by�o nigdy zmieniane.%0AProsz� zmieni� je teraz."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@@ -899,15 -713,12 +905,15 @@@
msgstr ""
"To has�o nie zosta�o zmienione%%0Aod %.4s-%.2s-%.2s. Prosz� zmieni� je teraz."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "Zmiana has�a"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "Zmieni� je p�niej"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -915,19 -726,16 +921,19 @@@
"%%0A?"
msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "w��czenie klucza do u�ycia"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA wymaga d�ugo�ci skr�tu b�d�cego wielokrotno�ci� 8 bit�w\n"
@@@ -969,57 -770,47 +975,62 @@@ msgstr "algorytm ochrony %d%s nie jest
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "b��d tworzenia potoku: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error creating a stream for a pipe: %s\n"
msgstr "b��d tworzenia potoku: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "b��d podczas tworzenia procesu: %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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
#| msgid "error running `%s': probably not installed\n"
msgid "error running '%s': probably not installed\n"
msgstr "b��d uruchamiania ,,%s'': prawdopodobnie nie zainstalowany\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "b��d uruchamiania ,,%s'': kod wyj�cia %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
msgstr "b��d uruchamiania ,,%s'': zako�czono\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "b��d odczytu kodu zako�czenia procesu %d: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -1033,15 -822,17 +1044,21 @@@ msgstr "problem z komunikacj� z gpg-age
msgid "problem setting the gpg-agent options\n"
msgstr "problem z ustawieniem opcji gpg-agenta\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "anulowano przez u�ytkownika\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "problem z agentem\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problem z agentem: %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
@@@ -1111,18 -888,19 +1128,23 @@@ msgstr "brak miejsca w bezpiecznej pami
msgid "out of core while allocating %lu bytes"
msgstr "brak miejsca podczas przydzielania %lu bajt�w"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 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"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: przestarza�a opcja ,,%s'' - nie ma efektu\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, 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\n"
msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� - nie ma efektu\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1425,7 -1136,6 +1447,7 @@@ msgstr "opcja ,,%.50s'' jest niejednozn
msgid "command \"%.50s\" is ambiguous\n"
msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "brak pami�ci\n"
@@@ -1434,23 -1143,15 +1456,18 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "b��dna opcja ,,%.50s''\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' not available\n"
msgid "conversion from '%s' to '%s' not available\n"
msgstr "konwersja z ,,%s'' do ,,%s'' niedost�pna\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open nie powiod�o si�: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "conversion from '%s' to '%s' failed: %s\n"
@@@ -1493,86 -1187,72 +1510,92 @@@ msgstr "blokada ,,%s'' nie za�o�ona: %s
msgid "waiting for lock %s...\n"
msgstr "oczekiwanie na blokad� %s...\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "opakowanie: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "niepoprawny nag��wek opakowania: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "nag��wek opakowania: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "nieznany nag��wek opakowania: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "nieoczekiwane opakowanie: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "niepoprawne oznaczenie linii minusami: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "niew�a�ciwy znak formatu radix64 ,,%02X'' zosta� pomini�ty\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "przedwczesny koniec pliku (brak CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "przedwczesny koniec pliku (w CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "b��d formatu CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "B��d sumy CRC; %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "b��d w linii ko�cz�cej\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
"przek�amanie wprowadzone przez serwer pocztowy\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "nieczytelne dla cz�owieka"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1580,82 -1260,72 +1603,94 @@@ msgstr "
"nazwa adnotacji musi zawiera� tylko znaki drukowalne lub spacje i ko�czy� "
"si� znakiem ,,=''\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "nazwa adnotacji u�ytkownika musi zawiera� znak ,,@''\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "nazwa adnotacjinie mo�e zawiera� wi�cej ni� jednego znaku ,,@''\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "warto�� adnotacji nie mo�e zawiera� �adnych znak�w steruj�cych\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "nazwa adnotacjinie mo�e zawiera� wi�cej ni� jednego znaku ,,@''\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "nazwa adnotacji musi zawiera� tylko znaki drukowalne lub spacje i ko�czy� "
+ "si� znakiem ,,=''\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "OSTRZE�ENIE: napotkano b��dne dane adnotacji\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "nieczytelne dla cz�owieka"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "nie uda�o si� przekaza� zapytania %s do klienta\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
#, fuzzy
#| msgid "Enter passphrase\n"
msgid "Enter passphrase: "
msgstr "Has�o\n"
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "nie dzia�a w trybie wsadowym\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "To polecenie jest dost�pne tylko dla kart w wersji 2\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Tw�j wyb�r? "
@@@ -1717,21 -1373,11 +1752,16 @@@ msgstr "URL do odczytania klucza public
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "B��d: URL zbyt d�ugi (limit to %d znak�w).\n"
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -1831,13 -1458,10 +1861,13 @@@ msgstr "Jakiej d�ugo�ci klucz do szyfro
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:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: 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:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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"
@@@ -1897,9 -1511,6 +1927,9 @@@ msgstr " (2) Klucz do szyfrowania\n
msgid " (3) Authentication key\n"
msgstr " (3) Klucz do uwierzytelniania\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Niew�a�ciwy wyb�r.\n"
@@@ -1935,7 -1540,6 +1965,7 @@@ msgstr "Podpisa� go? (t/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "wyj�cie z tego menu"
@@@ -1943,7 -1546,6 +1973,7 @@@
msgid "show admin commands"
msgstr "pokazanie polece� administratora"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "ten tekst pomocy"
@@@ -2019,125 -1603,96 +2049,125 @@@ msgstr "Polecenia dla administratora s
msgid "Admin commands are not allowed\n"
msgstr "Polecenia dla administratora nie s� dozwolone\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Niepoprawne polecenie (spr�buj ,,help'')\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nie mo�na otworzy� ,,%s''\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "b��d odczytu bloku kluczy: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(chyba, �e klucz zostaje wybrany przez podanie odcisku)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
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:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "Usun�� ten klucz ze zbioru? (t/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
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:196
++#: g10/delkey.c:195
#, 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:198
++#: g10/delkey.c:197
msgid "key"
msgstr ""
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Asymetryczne: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "informacja o zaufaniu dla w�a�ciciela klucza zosta�a wymazana\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "b��d podczas tworzenia has�a: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr ""
"ustawiony tryb S2K nie pozwala u�y� pakietu ESK dla szyfru symetrycznego\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "szyfrem %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr ",,%s'' ju� jest skompresowany\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "odczyt z ,,%s''\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2145,7 -1700,6 +2175,7 @@@ msgstr "
"OSTRZE�ENIE: wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami "
"adresata\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2154,38 -1708,31 +2184,38 @@@ msgstr "
"OSTRZE�ENIE: wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami "
"adresata\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "%s nie jest dost�pne w trybie %s\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "%s nie jest dost�pne w trybie %s\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "dane zaszyfrowano za pomoc� %s\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"OSTRZE�ENIE: wiadomo�� by�a szyfrowana kluczem s�abym szyfru symetrycznego.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problem podczas obr�bki pakietu szyfrowego\n"
@@@ -2247,135 -1783,107 +2277,135 @@@ 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:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "eksport podpis�w oznaczonych jako tylko lokalne"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr "eksport atrybut�w ID u�ytkownika (og�lnie ID zdj��)"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "eksport kluczy uniewa�niaj�cych oznaczonych jako ,,poufne''"
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "usuni�cie bezu�ytecznych cz�ci z klucza przy eksporcie"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr "usuni�cie jak najwi�kszej cz�ci klucza przy eksporcie"
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: pomini�ty: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "eksport kluczy tajnych nie jest dozwolony\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "klucz %s: zawarto�� klucza na karcie - pomini�to\n"
- #: g10/export.c:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "b��d tworzenia ,,%s'': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[brak identyfikatora u�ytkownika]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, 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:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "b��d zamykania %s: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, 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:1423
++#: g10/getkey.c:1427
#, 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:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "Brak odcisku"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego klucza tajnego"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego klucza tajnego"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "z�o�enie podpisu"
@@@ -2383,11 -1890,9 +2413,11 @@@
msgid "make a clear text signature"
msgstr "z�o�enie podpisu pod dokumentem"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "z�o�enie podpisu oddzielonego od dokumentu"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "szyfrowanie danych"
@@@ -2395,15 -1899,12 +2425,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy�lne)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "lista kluczy"
@@@ -2415,15 -1914,12 +2445,15 @@@ msgstr "lista kluczy i podpis�w
msgid "list and check key signatures"
msgstr "wypisanie i sprawdzenie podpis�w kluczy"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisk�w"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "lista kluczy prywatnych"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "generacja nowej pary kluczy"
@@@ -2447,7 -1939,6 +2477,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "tworzenie certyfikatu uniewa�nienia klucza"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
@@@ -2479,7 -1964,6 +2509,7 @@@ msgstr "z�o�enie prywatnego podpisu na
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "zmiana has�a"
@@@ -2527,23 -2000,18 +2557,23 @@@ msgstr "uaktualnienie bazy zaufania
msgid "print message digests"
msgstr "wypisanie skr�t�w wiadomo�ci"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "uruchomienie w trybie serwera"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "opakowanie ASCII pliku wynikowego"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|U�YTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|U�YTKOWNIK|u�ycie tego identyfikatora u�ytkownika do podpisania lub "
@@@ -2557,11 -2023,9 +2587,11 @@@ msgstr "|N|ustawienie poziomu kompresj
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|PLIK|zapis wyj�cia do PLIKU"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
@@@ -2573,7 -2035,6 +2603,7 @@@ msgstr "pytanie przed nadpisaniem plik�
msgid "use strict OpenPGP behavior"
msgstr "�cis�e zachowanie OpenPGP"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2581,7 -2042,6 +2611,7 @@@ msgstr "
"@\n"
"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2603,13 -2063,11 +2633,13 @@@ msgstr "
" --list-keys [nazwy] pokazanie klucze\n"
" --fingerprint [nazwy] pokazanie odcisk�w kluczy\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2624,7 -2082,6 +2654,7 @@@ msgstr "
"Podpisywanie, sprawdzanie podpis�w, szyfrowanie, rozszyfrowywanie\n"
"Domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2632,78 -2089,64 +2662,78 @@@ msgstr "
"\n"
"Obs�ugiwane algorytmy:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Asymetryczne: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Symetryczne: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Skr�t�w: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Kompresji: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "wywo�anie: gpgsm [opcje]"
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2711,7 -2154,6 +2741,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1537
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2721,7 -2163,6 +2751,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2729,7 -2170,6 +2759,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1546
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2737,7 -2177,6 +2767,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1549
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2748,7 -2187,6 +2778,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2756,511 -2194,401 +2786,511 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, 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:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"pokazywanie URL-i preferowanych serwer�w kluczy przy wypisywaniu podpis�w"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
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:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr "pokazywanie uniewa�nionych i wygas�ych podkluczy na listach kluczy"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Dost�pne klucze:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "nieznana opcja ,,%s''\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
#| msgid "unknown command `%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "nieznane polecenie ,,%s''\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, 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:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, 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:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "niezrozumia�y URL serwera kluczy\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
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:3053
++#: g10/gpg.c:3060
msgid "show only the primary user ID in signature verification"
msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "sprawdzanie podpis�w z danymi PKA"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, 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:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "Niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno u�ywa� %s z %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w po��czeniu z %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "wybrany algorytm kompresji jest niepoprawny\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "niew�a�ciwe domy�lne ustawienia\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "niew�a�ciwe ustawienia szyfr�w\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "niew�a�ciwe ustawienia skr�t�w\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie dzia�a z %s!\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [plik]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, 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:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [plik]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
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:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [plik]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [plik]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
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:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [plik]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key nazwa u�ytkownika"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key nazwa u�ytkownika"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key nazwa u�ytkownika [polecenia]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd <id-u�ytkownika>"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "eksport kluczy nie powi�d� si�: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "eksport kluczy nie powi�d� si�: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, 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:4537
++#: g10/gpg.c:4544
#, 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:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[nazwa pliku]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
@@@ -3272,7 -2598,6 +3302,7 @@@ msgstr "|PLIK|pobieranie kluczy ze zbio
msgid "make timestamp conflicts only a warning"
msgstr "nie traktowa� konfliktu datownik�w jako b��du"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|pisanie opisu stanu do deskryptora FD"
@@@ -3298,128 -2619,102 +3328,128 @@@ msgstr "Pomoc niedost�pna
msgid "No help available for '%s'"
msgstr "Brak pomocy o ,,%s''"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "import podpis�w oznaczonych jako tylko lokalne"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "naprawienie uszkodze� z serwera pks przy imporcie"
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "nie uaktualnianie bazy zaufania po imporcie"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "nie uaktualnianie bazy zaufania po imporcie"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "przyjmowanie tylko uaktualnie� istniej�cych kluczy"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "usuwanie bezu�ytecznych cz�ci kluczy po imporcie"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "usuwanie jak najwi�kszej cz�ci kluczy po imporcie"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d zostaje pomini�ty\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kluczy przetworzonych do tej chwili\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Og�em przetworzonych kluczy: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " pomini�tych nowych kluczy: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " pomini�tych nowych kluczy: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identyfikatora: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " do��czono do zbioru: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmian: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nowych identyfikator�w: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nowych podkluczy: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " nowych podpis�w: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nowych uniewa�nie� kluczy: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " tajnych kluczy wczytanych: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tajnych kluczy dodanych: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajnych kluczy bez zmian: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nie w��czono do zbioru: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " podpis�w wyczyszczonych: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr "ID u�ytkownika wyczyszczonych: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3428,200 -2723,160 +3458,200 @@@ msgstr "
"OSTRZE�ENIE: klucz %s zawiera preferencje dla niedost�pnych\n"
"algorytm�w dla tych ID u�ytkownika:\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " ,,%s'': preferowany szyfr %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " ,,%s'': preferowany algorytm skr�tu %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " ,,%s'': preferowany algorytm kompresji %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "zdecydowanie sugerowane jest uaktualnienie ustawie� i ponowne\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "rozes�anie tego klucza w celu unikni�cia niezgodno�ci algorytm�w\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"mo�na uaktualni� swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "klucz %s: brak identyfikatora u�ytkownika\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "pomini�ty ,,%s'': %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "klucz %s: podklucz uszkodzony przez serwer zosta� naprawiony\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "klucz %s: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "klucz %s: brak poprawnych identyfikator�w u�ytkownika\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klucz %s: brak klucza publicznego: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "klucz %s: nowy klucz - pomini�ty\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klucz %s: klucz publiczny ,,%s'' wczytano do zbioru\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klucz %s: nie zgadza si� z lokaln� kopi�\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
- #: g10/import.c:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "klucz %s: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klucz %s: ,,%s'' 1 nowy podpis\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klucz %s: ,,%s'' %d nowych podpis�w\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klucz %s: ,,%s'' 1 nowy podklucz\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klucz %s: ,,%s'' %d nowych podkluczy\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klucz %s: ,,%s'' %d podpis wyczyszczony\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klucz %s: ,,%s'' %d podpis�w wyczyszczonych\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "klucz %s: ,,%s'' %d identyfikator u�ytkownika wyczyszczony\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klucz %s: ,,%s'' bez zmian\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, 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:1684
++#: g10/import.c:1683
#, 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:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3636,208 -2891,191 +3666,233 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "klucz %s: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klucz %s: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klucz %s: brak identyfikatora u�ytkownika do podpisu\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klucz %s: nieobs�ugiwany algorytm asymetryczny\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "klucz %s: nieprawid�owy bezpo�redni podpis\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "klucz %s: brak podklucza do dowi�zania\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klucz %s: niepoprawne dowi�zanie podklucza\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "klucz %s: usuni�to wielokrotne dowi�zanie podklucza\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klucz %s: niepoprawne uniewa�nienie podklucza\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "klucz %s: usuni�to wielokrotne uniewa�nienie podklucza\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "klucz %s: pomini�to identyfikator u�ytkownika ,,%s''\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "klucz %s: podklucz pomini�ty\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klucz %s: ,,%s'' dodany certyfikat uniewa�nienia\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "klucz %s: dodano bezpo�redni podpis\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
#| msgid "error creating keybox `%s': %s\n"
msgid "error creating keybox '%s': %s\n"
msgstr "b��d tworzenia keyboksa ,,%s'': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
#| msgid "keybox `%s' created\n"
msgid "keybox '%s' created\n"
msgstr "keybox ,,%s'' utworzony\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, 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:908
++#: g10/keydb.c:907
#, 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:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[uniewa�nienie]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[podpis klucza nim samym]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d niepoprawnych podpis�w\n"
- msgstr[1] "%d niepoprawnych podpis�w\n"
- msgstr[2] "%d niepoprawnych podpis�w\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "klucz %s: nieobs�ugiwany algorytm asymetryczny\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "karta nie obs�uguje algorytmu skr�tu %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "Good signature from"
+ msgid " (reordered signatures follow)"
+ msgstr "Poprawny podpis z�o�ony przez"
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "skipped \"%s\": %s\n"
+ msgid "key %s:\n"
+ msgstr "pomini�ty ,,%s'': %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
+ msgstr[1] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
+ msgstr[2] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3846,28 -3084,28 +3901,32 @@@ msgstr[0] "1 podpis nie zosta� sprawdzo
msgstr[1] "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
msgstr[2] "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
- msgstr[1] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
- msgstr[2] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d niepoprawnych podpis�w\n"
+ msgstr[1] "%d niepoprawnych podpis�w\n"
+ msgstr[2] "%d niepoprawnych podpis�w\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] ""
- "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
- msgstr[1] ""
- "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
- msgstr[2] ""
- "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Poprawny podpis z�o�ony przez"
+ msgstr[1] "Poprawny podpis z�o�ony przez"
+ msgstr[2] "Poprawny podpis z�o�ony przez"
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
+
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3878,17 -3116,14 +3937,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:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = mam ograniczone zaufanie\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = mam pe�ne zaufanie\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3898,50 -3133,38 +3957,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:501
++#: g10/keyedit.c:1014
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:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Czy na pewno chcesz podpisa�? (t/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Nie da si� z�o�y� podpisu.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Identyfikator u�ytkownika ,,%s'' jest podpisywalny. "
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "Podpisa� go? (t/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3950,11 -3173,9 +4009,11 @@@ msgstr "
"Podpis klucza nim samym na ,,%s''\n"
"jest podpisem z�o�onym przez PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3963,11 -3184,9 +4022,11 @@@ msgstr "
"Tw�j podpis na ,,%s''\n"
"przekroczy� dat� wa�no�ci.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3976,45 -3195,36 +4035,45 @@@ msgstr "
"Tw�j podpis na ,,%s''\n"
"jest podpisem prywatnym (lokalnym).\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr ",,%s'' jest ju� lokalnie podpisany kluczem %s\n"
- #: g10/keyedit.c:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr ",,%s'' jest ju� podpisany kluczem %s\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
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:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nie ma nic do podpisania kluczem %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Data wa�no�ci tego klucza up�yn�a!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Wa�no�� tego klucza wygasa %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4023,33 -3233,27 +4082,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:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nie odpowiem na to pytanie. %s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) W og�le nie.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Pobie�nie.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Bardzo dok�adnie.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, 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:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4058,242 -3262,184 +4117,238 @@@ msgstr "
"Czy jeste� naprawd� pewien, �e chcesz podpisa� ten klucz\n"
"swoim kluczem ,,%s'' (%s)\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "To b�dzie podpis klucza nim samym.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
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:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Czy na pewno podpisa�? (t/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
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:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "zapis zmian i wyj�cie"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "okazanie odcisku klucza"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Uchwyt klucza: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "lista kluczy i identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "wyb�r identyfikatora u�ytkownika N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "wyb�r podklucza N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "sprawdzenie podpis�w"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
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:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr ""
"z�o�enie prywatnego (lokalnego) podpisu na wybranych identyfikatorach "
"u�ytkownika"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "podpisanie wybranych identyfikator�w u�ytkownika sygnatur� zaufania"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
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:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "dodanie zdj�cia u�ytkownika do klucza"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "usuni�cie wybranych identyfikator�w u�ytkownika z klucza"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "dodanie podklucza"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "dodanie klucza do karty procesorowej"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "przeniesienie klucza na kart� procesorow�"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "przeniesienie klucza zapasowego na kart� procesorow�"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "usuni�cie wybranych podkluczy"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "dodanie klucza uniewa�niaj�cego"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "usuni�cie podpis�w z wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
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:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "oznaczenie wybranego identyfikatora u�ytkownika jako g��wnego"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "ustawienia (zaawansowane)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "rozbudowana lista ustawie�"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "ustawienie listy preferencji dla wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
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:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "ustawienie adnotacji dla wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "zmiana has�a klucza"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "zmiana zaufania w�a�ciciela"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "uniewa�nienie podpis�w na wybranych identyfikatorach u�ytkownika"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "uniewa�nienie wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "uniewa�nienie klucza lub wybranych podkluczy"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "w��czenie klucza do u�ycia"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "wy��czenie klucza z u�ycia"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "okazanie wybranych identyfikator�w - zdj��"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
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:1465
++#: g10/keyedit.c:1931
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:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Dost�pny jest klucz tajny.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4313,260 -3459,208 +4368,266 @@@ msgstr "
"(ltsign,\n"
" tnrsign itd.).\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Klucz uniewa�niony."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "Czy na pewno podpisa� wszystkie identyfikatory u�ytkownika? (t/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, 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:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Nieznany rodzaj podpisu ,,%s''\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr ""
"Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? (t/N) "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "Czy na pewno przenie�� g��wny klucz (t/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Musisz wybra� dok�adnie jeden klucz.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "Polecenie oczekuje argumentu b�d�cego nazw� pliku\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, 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:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Musisz wybra� co najmniej jeden klucz.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
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:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "Czy na pewno chcesz usun�� ten klucz? (t/N) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
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:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? (t/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
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:2099
++#: g10/keyedit.c:2565
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:2101
++#: g10/keyedit.c:2567
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:2150
++#: g10/keyedit.c:2625
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:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Ustawienie listy ustawie� na:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Czy na pewno uaktualni� ustawienia? (t/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Zapisa� zmiany? (t/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Wyj�� bez zapisania zmian? (t/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "zapis zmian nie powi�d� si�: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
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:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "niew�a�ciwy odcisk"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, 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:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "niepoprawna warto��\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Brak takiego identyfikatora u�ytkownika.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, 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:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Skr�t: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Ustawienia: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "no-modify dla serwera kluczy"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Preferowany serwer kluczy: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "Adnotacje: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(poufne)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "utworzono: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "uniewa�niono: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "wygas�: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "wygasa: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "u�ycie: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "nr-karty: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "zaufanie: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "poprawno��: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Ten klucz zosta� wy��czony z u�ytku"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4574,17 -3668,12 +4635,17 @@@ msgstr "
"Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
"dop�ki program nie zostanie uruchomiony ponownie.\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "uniewa�niony"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "wygas�"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4593,17 -3682,14 +4654,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4612,35 -3698,27 +4673,35 @@@ msgstr "
"OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
" niekt�re wersje przestan� go rozumie�.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Czy dalej chcesz je doda�? (t/N) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
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:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Usun�� ten poprawny podpis? (t/N/w) "
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Usun�� ten nieznany podpis? (t/N/w) "
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4649,20 -3727,16 +4710,20 @@@ msgstr[0] "%d podpis usuni�ty.\n
msgstr[1] "%d podpis usuni�ty.\n"
msgstr[2] "%d podpis usuni�ty.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Nic nie zosta�o usuni�te.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "niepoprawny"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Identyfikator u�ytkownika ,,%s'' upakowany: %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4671,17 -3745,14 +4732,17 @@@ msgstr[0] "Identyfikator u�ytkownika ,,
msgstr[1] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
msgstr[2] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Identyfikator u�ytkownika ,,%s'': ju� zmniejszony.\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Identyfikator u�ytkownika ,,%s'': ju� czysty.\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4691,37 -3762,29 +4752,37 @@@ msgstr "
" uniewa�niaj�cego spowoduje, �e niekt�re wersje PGP przestan�\n"
" go rozumie�.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
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:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4730,232 -3793,182 +4791,232 @@@ msgid "
"N) "
msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "Zmiana daty wa�no�ci podklucza.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, 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:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "Podaj preferowany URL serwera kluczy: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Czy na pewno chcesz go zast�pi�? (t/N) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Czy na pewno chcesz go usun��? (t/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "Adnotacje: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "Kontynuowa�? (t/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Brak identyfikatora u�ytkownika o skr�cie %s\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "Brak podklucza o numerze %d.\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "identyfikator u�ytkownika: ,,%s''\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (podpis nieeksportowalny) "
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Wa�no�� tego klucza wygas�a %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "Nie podpisane przez ciebie.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (podpis nieuniewa�nialny) "
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, 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:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "brak klucza tajnego\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Klucz %s jest ju� uniewa�niony.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Podklucz %s jest ju� uniewa�niony.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Wy�wietlanie zdj�cia w formacie %s o rozmiarze %ld bajt�w dla klucza %s (id "
"%d).\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
msgstr "ustawienie ,,%s'' powtarza si�\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "zbyt wiele ustawie� szyfru\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "zbyt wiele ustawie� funkcji skr�tu\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "zbyt wiele ustawie� kompresji\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "niew�a�ciwy element `%s' w tek�cie ustawie�\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "zapis podpisu bezpo�redniego\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "zapis podpisu klucza nim samym\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "zapis podpisu wi���cego klucz\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rozmiar klucza zaokr�glony w g�r� do %u bit�w\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"OSTRZE�ENIE: niekt�re programy OpenPGP nie potrafi� obs�u�y� klucza RSA o "
"tej d�ugo�ci skr�tu\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Podpisywanie"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Certyfikowanie"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Szyfrowanie"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Uwierzytelnianie"
@@@ -4969,158 -3982,127 +5030,158 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "PpSsUuZz"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Mo�liwe akcje dla klucza %s: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "Aktualnie dopuszczalne akcje: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Prze��czenie mo�liwo�ci podpisywania\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Prze��czenie mo�liwo�ci szyfrowania\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Prze��czenie mo�liwo�ci uwierzytelniania\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Zako�czenie\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Prosz� wybra� rodzaj klucza:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA i RSA (domy�lne)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA i Elgamala\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (tylko do podpisywania)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (tylko do podpisywania)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamala (tylko do szyfrowania)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (tylko do szyfrowania)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (mo�liwo�ci do ustawienia)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (mo�liwo�ci do ustawienia)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
#| msgid " (%d) DSA and Elgamal\n"
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA i Elgamala\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (tylko do podpisywania)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (mo�liwo�ci do ustawienia)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (tylko do szyfrowania)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
#| msgid " (%d) Existing key\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Istniej�cy klucz\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "Uchwyt klucza: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Nieprawid�owy uchwyt klucza (oczekiwano 40 cyfr szesnastkowych)\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "Brak klucza o tym uchwycie\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "Klucze %s b�d� mia�y od %u do %u bit�w d�ugo�ci.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Jakiej d�ugo�ci podklucz wygenerowa�? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "zaokr�glono do %u bit�w\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Prosz� wybra� rodzaj klucza:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5136,7 -4118,6 +5197,7 @@@ msgstr "
" <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
" <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5152,38 -4133,30 +5213,38 @@@ msgstr "
" <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
" <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Okres wa�no�ci klucza? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Okres wa�no�ci podpisu? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "niepoprawna warto��\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "Klucz nie wyga�nie w og�le\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "Podpis nie wyga�nie w og�le\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "Klucz traci wa�no�� %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "Wa�no�� podpisu wygasa %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5191,11 -4164,9 +5252,11 @@@ msgstr "
"Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
"Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Czy wszystko si� zgadza (t/N)? "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5209,7 -4180,6 +5270,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5225,50 -4195,39 +5286,50 @@@ msgstr "
" \"Tadeusz �ele�ski (Boy) <tzb at ziemianska.pl>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Imi� i nazwisko: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
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:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Adres poczty elektronicznej: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "To nie jest poprawny adres poczty elektronicznej\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Komentarz: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Niew�a�ciwy znak w komentarzu\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5279,7 -4238,6 +5340,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5296,27 -4254,22 +5357,27 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "IiKkEeDdWw"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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? "
@@@ -5324,11 -4277,9 +5385,11 @@@ msgstr "
"Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
"czy (W)yj�� z programu? "
- #: g10/keygen.c:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Najpierw trzeba poprawi� ten b��d\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5344,12 -4295,10 +5405,12 @@@ msgstr "
"ilo�ci\n"
"entropii.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powiod�a si�: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5357,71 -4306,58 +5418,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "klucz ju� istnieje\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, 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:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "generowanie nowego klucza\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zosta�a anulowana.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5429,7 -4365,6 +5490,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:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5437,7 -4372,6 +5498,7 @@@ msgstr "
"klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5445,50 -4379,39 +5506,50 @@@ msgstr "
"klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Czy na pewno utworzy�? (t/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "nigdy "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Krytyczny regulamin podpisu: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Regulamin podpisu: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Krytyczny preferowany serwer kluczy: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Krytyczne adnotacje podpisu: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Adnotacje podpisu: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5497,7 -4420,14 +5558,16 @@@ msgstr[0] "%d niepoprawnych podpis�w\n
msgstr[1] "%d niepoprawnych podpis�w\n"
msgstr[2] "%d niepoprawnych podpis�w\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
+ msgstr[1] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
+ msgstr[2] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@@ -5505,48 -4435,38 +5575,48 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Zbi�r kluczy"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "pomini�ty ,,%s'': %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Odcisk klucza g��wnego:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Odcisk klucza g��wnego:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " Odcisk klucza ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " Nr seryjny karty ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "buforowanie zbioru kluczy ,,%s''\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5555,7 -4475,6 +5625,7 @@@ msgstr[0] "%lu kluczy zbuforowano do te
msgstr[1] "%lu kluczy zbuforowano do tej pory (%lu podpis�w)\n"
msgstr[2] "%lu kluczy zbuforowano do tej pory (%lu podpis�w)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
@@@ -5563,7 -4482,6 +5633,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5572,58 -4490,45 +5642,58 @@@ msgstr[0] "1 niepoprawny podpis\n
msgstr[1] "1 niepoprawny podpis\n"
msgstr[2] "1 niepoprawny podpis\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: zbi�r kluczy utworzony\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "w��czenie uniewa�nionych kluczy do wynik�w wyszukiwania"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "w��czenie podkluczy przy poszukiwaniu po ID klucza"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "automatyczne pobieranie kluczy przy sprawdzaniu podpis�w"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr "honorowanie URL-a preferowanego serwera kluczy ustawionego w kluczu"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
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:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "wy��czony"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Wprowad� numer(y), N)ast�pny lub Q)uit > "
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, 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:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ",,%s'' nie jest identyfikatorem klucza - pomini�to\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5632,474 -4537,380 +5702,474 @@@ msgstr[0] "od�wie�anie %d kluczy z %s\n
msgstr[1] "od�wie�anie %d kluczy z %s\n"
msgstr[2] "od�wie�anie %d kluczy z %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "klucz ,,%s'' nie zosta� odnaleziony na serwerze kluczy\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "klucz nie zosta� odnaleziony na serwerze kluczy\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "zapytanie o klucz %s z serwera %s %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "zapytanie o klucz %s z %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "brak akcji serwera kluczy!\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "wysy�anie klucza %s na %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, 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:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "OSTRZE�ENIE: nie mo�na pobra� URI %s: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "dziwny rozmiar jak na zaszyfrowany klucz sesyjny (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "klucz sesyjny zaszyfrowany %s\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "has�o wygenerowane nieznanym algorytmem skr�tu %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "klucz publiczny to %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr ""
"zaszyfrowano %u-bitowym kluczem %s o identyfikatorze %s, stworzonym %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " ,,%s''\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "zaszyfrowane za pomoc� %lu hase�\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "zaszyfrowane jednym has�em\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "szyfr IDEA nie jest dost�pny, pr�ba u�ycia %s zamiast niego\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "odszyfrowanie poprawne\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "b��d odszyfrowywania: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "pierwotna nazwa pliku='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "OSTRZE�ENIE: widziano wiele czystych tekst�w\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
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:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "nie znaleziono podpisu\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "NIEPOPRAWNY podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Przeterminowany podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "Poprawny podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "nie mo�na obs�u�y� tych wieloznacznych danych podpisu\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Podpisano w %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " przy u�yciu klucza %s %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Klucz dost�pny w: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[niepewne]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " alias ,,%s''"
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Wa�no�� podpisu wygas�a %s.\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Wa�no�� podpisu wygasa %s.\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binarny"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "tekstowy"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "nieznany"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algorytm: %s"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "nie jest oddzielonym podpisem.\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "oddzielony podpis klasy 0x%02x.\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starego typu (PGP 2.x).\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) nie powiod�o si� w %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"OSTRZE�ENIE: klucze do podpisywania i szyfrowania Elgamala s� odradzane\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "OSTRZE�ENIE: u�ycie eksperymentalnego szyfru %s\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "OSTRZE�ENIE: u�ycie eksperymentalnego algorytmu skr�tu %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "OSTRZE�ENIE: algorytm skr�tu %s jest odradzany\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "b��d odczytu w ,,%s'': %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "b��d odczytu w ,,%s'': %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "w jej miejsce nale�y u�y� ,,%s%s''\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Nieskompresowany"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "nieskompresowany|brak"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "niejednoznaczna opcja ,,%s''\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "nieznana opcja ,,%s''\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
#, 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:1754
++#: g10/misc.c:1752
#, 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
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Plik ,,%s'' ju� istnieje. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Nadpisa�? (t/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: nieznana ko�c�wka nazwy\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Nazwa pliku"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "zapisywanie na wyj�cie standardowe\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "nowy plik ustawie� ,,%s'' zosta� utworzony\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
"bezpieczny\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problem z agentem: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (ID g��wnego klucza %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6113,15 -4924,12 +6183,15 @@@ msgstr "
"Klucz o d�ugo�ci %u bit�w, typ %s, ID %s,\n"
"stworzony %s%s.\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Has�o\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "anulowano przez u�ytkownika\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6130,53 -4938,44 +6200,53 @@@ msgstr "
"Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
",,%s''\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "d�ugo�� %u bit�w, typ %s, numer %s, stworzony %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (podklucz dla g��wnego klucza o ID %s)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
#| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Prosz� wprowadzi� has�o do odbezpieczenia obiektu PKCS#12."
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6234,31 -5025,24 +6304,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "nie podano przyczyny"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "klucz zosta� zast�piony"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "klucz zosta� skompromitowany"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "klucz nie jest ju� u�ywany"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "identyfikator u�ytkownika przesta� by� poprawny"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "pow�d uniewa�nienia: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "komentarz do uniewa�nienia: "
@@@ -6272,52 -5056,41 +6342,52 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMwWpP"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Brak warto�ci zaufania dla:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " alias ,,%s''\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = nie wiem albo nie powiem\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NIE ufam\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = ufam absolutnie\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = powr�t do g��wnego menu\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " p = pomini�cie tego klucza\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " w = wyj�cie\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6326,37 -5099,29 +6396,37 @@@ msgstr "
"Minimalny poziom zaufania dla tego klucza to: %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Twoja decyzja? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "Ten klucz prawdopodobnie nale�y do tej osoby\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Ten klucz nale�y do nas\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6366,138 -5131,110 +6436,138 @@@ 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:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "U�y� tego klucza pomimo to? (t/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " To mo�e oznacza�, �e podpis jest fa�szerstwem.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, 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:589
++#: g10/pkclist.c:604
#, 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:601
++#: g10/pkclist.c:616
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:609
++#: g10/pkclist.c:624
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:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Ten podpis prawdopodobnie jest FA�SZYWY.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: pomini�ty: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, 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:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "linia %d: niew�a�ciwy algorytm\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "linia %d: niew�a�ciwy algorytm\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Aktualni odbiorcy:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6505,169 -5242,133 +6575,169 @@@ msgstr "
"\n"
"Identyfikator u�ytkownika (pusta linia oznacza koniec): "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Brak takiego identyfikatora u�ytkownika.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Klucz publiczny wy��czony z u�ycia.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nieznany domy�lny adresat ,,%s''\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "brak poprawnych adresat�w\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Uwaga: klucz %s nie ma cechy %s\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Podpis oddzielony od danych.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Nazwa pliku danych: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "czytam strumie� standardowego wej�cia\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "brak podpisanych danych\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nie mo�na otworzy� podpisanych danych z fd=%d: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "adresat anonimowy; sprawdzanie klucza tajnego %s...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "OK, to my jeste�my adresatem anonimowym.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "stary, nieobs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "algorytm szyfruj�cy %d%s jest nieznany lub zosta� wy��czony\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "OSTRZE�ENIE: brak algorytmu szyfruj�cego %s w ustawieniach odbiorcy\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "UWAGA: wa�no�� klucza tajnego %s wygas�a %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "klucz %s nie ma identyfikator�w u�ytkownika\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Zostanie uniewa�niony przez:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(to jest czu�y klucz uniewa�niaj�cy)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, 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
++#: g10/revoke.c:327
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "wymuszono opakowanie ASCII wyniku.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, 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:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6676,20 -5377,17 +6746,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6698,22 -5396,18 +6768,22 @@@ msgstr "klucz prywatny ,,%s'' nie zosta
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6737,80 -5431,64 +6807,80 @@@ msgstr "
"komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
"nieupowa�nionym.\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Anuluj"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Pow�d uniewa�nienia: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(nie podano)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Informacje poprawne? (t/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "wygenerowano s�aby klucz - operacja zostaje powt�rzona\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
"operacja by�a powtarzana %d razy!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, fuzzy, c-format
#| msgid "%s key uses an unsafe (%u bit) hash\n"
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "Klucz %s u�ywa niebezpiecznego (%u-bitowego) skr�tu\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, fuzzy, c-format
#| msgid "DSA key %s requires a %u bit or larger hash\n"
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:114
++#: g10/sig-check.c:116
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:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "obja�nienie mo�na przeczyta� tutaj: %s\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6819,7 -5497,6 +6889,7 @@@ msgstr[0] "klucz publiczny %s jest o %l
msgstr[1] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
msgstr[2] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6828,7 -5505,6 +6898,7 @@@ msgstr[0] "klucz publiczny %s jest o %l
msgstr[1] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
msgstr[2] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6846,7 -5522,6 +6916,7 @@@ msgstr[2] "
"klucz %s zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni lub �le ustawiony zegar systemowy)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6863,43 -5538,36 +6933,43 @@@ msgstr[2] "
"klucz %s zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni lub �le ustawiony zegar systemowy)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, 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:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "klucz %s: brak podklucza dowi�zywanego podpisem\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"OSTRZE�ENIE: nie mo�na rozwin�� %% w URL adnotacji (jest zbyt d�ugi).\n"
" U�yty zostanie nie rozwini�ty.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6907,7 -5575,6 +6977,7 @@@ msgstr "
"OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
" (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6916,12 -5583,10 +6986,12 @@@ msgstr "
"OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL-u preferowanego\n"
" serwera kluczy (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "podpis %s/%s z�o�ony przez: ,,%s''\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6929,42 -5594,34 +6999,42 @@@ msgstr "
"OSTRZE�ENIE: wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami "
"adresata\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "podpis:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "zostanie u�yty szyfr %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap�\n"
"generatora liczb losowych!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "pomini�ty ,,%s'': duplikat\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, 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"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6973,302 -5630,243 +7043,302 @@@ msgstr "
"# Lista przypisanych warto�ci zaufania, stworzona %s\n"
"# (u�yj \"gpg --import-ownertrust\" aby j� przywr�ci�)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error in '%s': %s\n"
msgstr "b��d w ,,%s'': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "linia zbyt d�uga"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "brak dwukropka"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "niew�a�ciwy odcisk"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "brak warto�ci zaufania w�a�ciciela"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
#| msgid "error finding trust record in `%s': %s\n"
msgid "error finding trust record in '%s': %s\n"
msgstr "b��d podczas szukania zapisu warto�ci zaufania w ,,%s'': %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "read error in '%s': %s\n"
msgstr "b��d odczytu w ,,%s'': %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
#| msgid "can't create lock for `%s'\n"
msgid "can't create lock for '%s'\n"
msgstr "nie mo�na utworzy� blokady dla ,,%s''\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
#| msgid "can't lock `%s'\n"
msgid "can't lock '%s'\n"
msgstr "nie mo�na zablokowa� ,,%s''\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod�a si�: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:675
+ #, c-format
+ msgid "%s: directory does not exist!\n"
+ msgstr "%s: katalog nie istnieje!\n"
+
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
msgstr "nie mo�na dosta� si� do ,,%s'': %s\n"
- #: g10/tdbio.c:688
- #, c-format
- msgid "%s: directory does not exist!\n"
- msgstr "%s: katalog nie istnieje!\n"
-
- #: g10/tdbio.c:711
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: baza zaufania utworzona\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "UWAGA: nie mo�na zapisywa� bazy zaufania\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: niepoprawny plik bazy zaufania\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: b��d przy uaktualnianiu numeru wersji: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: b��d odczytu numeru wersji: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: b��d zapisu numeru wersji: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "baza zaufania: funkcja lseek() zawiod�a: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: to nie jest plik bazy zaufania\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: wpis wersji z numerem %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: niew�a�ciwa wersja pliku %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: b��d odczytu pustego wpisu: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "B��d: uszkodzona baza zaufania.\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "linia d�u�sza ni� %d znak�w\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "b��d wysy�ania standardowych opcji: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "nieobs�ugiwany algorytm: %s"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "b��d wysy�ania polecenia %s: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "b��d podczas otwierania ,,%s'': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "b��d wysy�ania polecenia %s: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "klucz publiczny %s nie odnaleziony: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
#| msgid "error storing flags: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "b��d zapisywania flag: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "poprawno��: %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "b��d pobierania zapisanych flag: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7276,18 -5874,15 +7346,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista kluczy"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
@@@ -7295,7 -5890,6 +7365,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7304,7 -5898,6 +7374,7 @@@ msgstr[0] "wypisanie skr�t�w wiadomo�ci
msgstr[1] "wypisanie skr�t�w wiadomo�ci"
msgstr[2] "wypisanie skr�t�w wiadomo�ci"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
@@@ -7312,7 -5905,6 +7382,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
@@@ -7320,7 -5912,6 +7390,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7331,184 -5922,165 +7401,196 @@@ msgstr[2] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "b��d tworzenia potoku: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "wypisanie skr�t�w wiadomo�ci"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "b��d wysy�ania polecenia %s: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "klucz %s: zaakceptowany jako klucz zaufany\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "klucz %s zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
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:431
++#: g10/trustdb.c:430
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:468
++#: g10/trustdb.c:467
#, 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:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "u�ycie modelu zaufania %s\n"
@@@ -7517,7 -6088,6 +7599,7 @@@
msgid "no need for a trustdb check\n"
msgstr "sprawdzanie bazy jest niepotrzebne\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
@@@ -7569,7 -6131,6 +7651,7 @@@ msgstr "brak absolutnie zaufanych klucz
msgid "public key of ultimately trusted key %s not found\n"
msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7577,30 -6138,24 +7659,30 @@@ msgstr "
"poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
"%du\n"
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
"nie mo�na uaktualni� rekordu wersji bazy zaufania: zapis nie powi�d� si�: "
"%s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "nieokre�lone"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "nigdy"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "marginalne"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "pe�ne"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "absolutne"
@@@ -7612,41 -6167,32 +7694,41 @@@
#. 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
++#: g10/trust.c:146
#, fuzzy
#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "17"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ uniewa�niony ]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[przeterminowany]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ nieznane ]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[ nieokre�lone ]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[ marginalne ]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ pe�ne ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ absolutne ]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7656,12 -6202,10 +7738,12 @@@ msgstr "
"Nale�y pami�ta� o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
"argumentu linii polece�.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "nie mo�na otworzy� fd %d: %s\n"
@@@ -7995,7 -6471,6 +8077,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:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
@@@ -8147,9 -6592,6 +8229,9 @@@ msgid "dirmngr cache-only key lookup fa
msgstr ""
"wyszukiwanie klucza tylko w pami�ci podr�cznej dirmngr nie powiod�o si�: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "nie uda�o si� przydzieli� uchwytu keyDB\n"
@@@ -8655,7 -6992,6 +8737,7 @@@ msgstr "(to nie wygl�da na zaszyfrowan
msgid "certificate '%s' not found: %s\n"
msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "b��d blokowania keyboksa: %s\n"
@@@ -8681,125 -7013,95 +8763,125 @@@ msgstr "usuni�cie certyfikatu ,,%s'' ni
msgid "no valid recipients given\n"
msgstr "nie podano poprawnych adresat�w\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "wypisanie kluczy zewn�trznych"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "wypisanie �a�cucha certyfikat�w"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "import certyfikat�w"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "eksport certyfikat�w"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "zarejestrowanie karty procesorowej"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "przekazanie polecenia do dirmngr"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "wywo�anie gpg-protect-tool"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "tworzenie wyj�cia zakodowanego base-64"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "przyj�cie wej�cia w formacie PEM"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "przyj�cie wej�cia w formacie base-64"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "przyj�cie wej�cia w formacie binarnym"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "pomini�cie CRL"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "sprawdzenie poprawno�ci przy u�yciu OCSP"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|liczba certyfikat�w do do��czenia"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "nie sprawdzanie polityk certyfikat�w"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "pobranie brakuj�cych certyfikat�w wystawc�w"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "nie u�ywanie w og�le terminala"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKU"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|PLIK|zapisanie log�w audytowych do PLIKU"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "tryb wsadowy: bez �adnych pyta�"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "przyj�cie odpowiedzi ,,tak'' na wi�kszo�� pyta�"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "przyj�cie odpowiedzi ,,nie'' na wi�kszo�� pyta�"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbior�w kluczy"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|U�YTKOWNIK|u�ycie tego identyfikatora jako domy�lnego klucza tajnego"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|u�ycie tego serwera do wyszukiwania kluczy"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAZWA|u�ycie tego algorytmu szyfrowania NAZWA"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAZWA|u�ycie tego algorytmu skr�tu wiadomo�ci"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
@@@ -8815,50 -7117,41 +8897,50 @@@ msgstr "
"S/MIME\n"
"Domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "UWAGA: nie mo�na zaszyfrowa� do ,,%s'': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
#| msgid "unknown validation model `%s'\n"
msgid "unknown validation model '%s'\n"
msgstr "nieznany model poprawno�ci ,,%s''\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: nie podano nazwy hosta\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: podano has�o bez u�ytkownika\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: linia pomini�ta\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "niezrozumia�y adres serwera kluczy\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "import wsp�lnych certyfikat�w ,,%s''\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
#| msgid "can't sign using `%s': %s\n"
msgid "can't sign using '%s': %s\n"
msgstr "nie mo�na podpisa� z u�yciem ,,%s'': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "b��dne polecenie (nie ma polecenia domy�lnego)\n"
@@@ -8876,7 -7166,6 +8958,7 @@@ msgid "basic certificate checks failed
msgstr ""
"podstawowe sprawdzenia certyikatu nie powiod�y si� - nie zaimportowany\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "b��d pobierania zapisanych flag: %s\n"
@@@ -8891,31 -7178,25 +8973,31 @@@ msgstr "b��d importu certyfikatu: %s\n
msgid "error reading input: %s\n"
msgstr "b��d odczytu wej�cia: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "nie uda�o si� pobra� odcisku\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "problem odszukaniem istniej�cego certyfikatu: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "b��d podczas szukania zapisywalnego keyDB: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "b��d zapisywania certyfikatu: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "problem z ponownym odszukaniem certyfikatu: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "b��d zapisywania flag: %s\n"
@@@ -9113,7 -7361,6 +9195,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
@@@ -9125,8 -7371,6 +9207,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:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
@@@ -9797,13 -7918,11 +9879,13 @@@ msgstr "eksport certyfikat�w
msgid "force the use of the default OCSP responder"
msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9811,90 -7930,74 +9893,90 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, 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:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, 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:342
++#: dirmngr/dirmngr-client.c:348
#, 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:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, 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:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate is valid\n"
msgstr "certyfikat jest dobry\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
#| msgid "certificate has been revoked"
msgid "certificate has been revoked\n"
msgstr "certyfikat zosta� uniewa�niony"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, 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:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported inquiry '%s'\n"
msgstr "nieobs�ugiwany algorytm: %s"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -10071,13 -8140,11 +10153,13 @@@ msgstr "wywo�anie: gpgsm [opcje]
msgid "colons are not allowed in the socket name\n"
msgstr "Nie wolno u�ywa� %s z %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, 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:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
@@@ -10618,86 -8583,70 +10700,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, 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:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, 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:1227
++#: dirmngr/server.c:1225
#, 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:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, 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:1377
++#: dirmngr/server.c:1375
#, 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:1410
++#: dirmngr/server.c:1408
#, 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:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, 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:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/pt.po
index 27c1c4c,c271492..fc504ea
--- a/po/pt.po
+++ b/po/pt.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2015-02-11 19:17+0100\n"
"Last-Translator: Pedro Morais <morais at kde.org>\n"
"Language-Team: pt <morais at kde.org>\n"
@@@ -101,8 -85,6 +101,8 @@@ msgstr "Por favor digite a frase secret
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "frase secreta incorrecta"
@@@ -158,25 -129,11 +158,25 @@@ msgstr "frase secreta incorrecta
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "imposs�vel criar `%s': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -385,8 -303,6 +385,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muda a frase secreta"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -396,68 -312,48 +396,68 @@@ msgstr "
"Op��es:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detalhado"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "procurar chaves num servidor de chaves"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualizar a base de dados de confian�a"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
@@@ -465,51 -361,40 +465,51 @@@ msgstr "
"|NOME|definir mapa de caracteres do terminal como\n"
"NOME"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "n�o suportado"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -518,163 -403,123 +518,168 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: directoria criada\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, 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:1960
++#: agent/gpg-agent.c:1968
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: imposs�vel criar directoria: %s\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignorado: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -690,8 -533,6 +695,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -699,9 -540,6 +704,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -711,46 -549,38 +716,46 @@@ msgstr "
"Op��es:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Por favor digite a frase secreta \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Por favor digite a frase secreta \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Por favor digite a frase secreta \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "cancelado pelo utilizador\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
@@@ -814,8 -634,6 +819,8 @@@ msgstr "
msgid "Yes"
msgstr "sim"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -845,46 -660,38 +850,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "muda a frase secreta"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Voc� quer realmente remover as chaves selecionadas? "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "activa uma chave"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -925,53 -725,42 +930,57 @@@ msgstr "algoritmo de protec��o %d%s n�
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro na leitura de `%s': %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "actualiza��o falhou: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "erro na leitura de `%s': %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "erro na leitura de `%s': %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "erro na leitura de `%s': %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -986,17 -773,18 +995,22 @@@ msgstr "problemas na comunica��o com o
msgid "problem setting the gpg-agent options\n"
msgstr "problema com o agente: o agente returnou 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "cancelado pelo utilizador\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "problema com o agente: o agente returnou 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problema com o agente: o agente returnou 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "imposs�vel desactivar core dumps: %s\n"
@@@ -1068,17 -842,18 +1082,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, fuzzy, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "erro ao criar porta-chaves `%s': %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1406,7 -1114,6 +1425,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "n�o processado"
@@@ -1416,22 -1122,14 +1435,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "voc� encontrou um bug ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
@@@ -1470,89 -1161,75 +1484,95 @@@ msgstr "chave p�blica %08lX n�o encontr
msgid "waiting for lock %s...\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "cabe�alho de armadura inv�lido: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "cabe�alho de armadura: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "cabe�alho de armadura: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "assinaturas em texto puro aninhadas\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "armadura inesperada:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "linha com h�fen inv�lida: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter radix64 inv�lido %02x ignorado\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "fim de ficheiro prematuro (sem CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "fim de ficheiro prematuro (no CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "CRC malformado\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "erro de CRC; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "erro na �ltima linha\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura inv�lida: linha maior que %d caracteres\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
"foi usado\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "n�o leg�vel por humanos"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1560,84 -1237,73 +1580,95 @@@ msgstr "
"um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
"terminar com um '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
+ "terminar com um '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "n�o leg�vel por humanos"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Digite a frase secreta: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "AVISO: %s sobrep�e %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Este comando n�o � permitido no modo %s.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Op��o? "
@@@ -1704,21 -1356,11 +1735,16 @@@ msgstr "a escrever chave p�blica para `
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@@ -1816,13 -1439,10 +1842,13 @@@ msgstr "Qual o tamanho de chave desejad
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1877,9 -1487,6 +1903,9 @@@ msgstr " (%d) RSA (apenas cifragem)\n
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Op��o inv�lida.\n"
@@@ -1913,7 -1514,6 +1939,7 @@@ msgstr "Realmente assinar?
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "sair deste menu"
@@@ -1922,7 -1521,6 +1948,7 @@@
msgid "show admin commands"
msgstr "comandos em conflito\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "mostra esta ajuda"
@@@ -2006,132 -1586,102 +2032,132 @@@ msgstr "comandos em conflito\n
msgid "Admin commands are not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "imposs�vel abrir `%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro na leitura do bloco de chave: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
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:136
++#: g10/delkey.c:135
#, 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:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Remover esta chave do porta-chaves?"
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Esta chave � secreta! - apagar de qualquer modo? "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "key"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Chave p�blica: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "informa��es de 'ownertrust' limpas\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "n�o � poss�vel utilizar o pacote ESK sim�trico devido ao modo S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, fuzzy, c-format
msgid "using cipher %s\n"
msgstr "assinatura falhou: %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "%s' j� comprimido\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVISO: `%s' � um ficheiro vazio\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "lendo de `%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2140,39 -1690,32 +2166,39 @@@ msgstr "
"ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
"destinat�rio\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, 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"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, 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"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "dados cifrados com %s\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado com algoritmo desconhecido %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"AVISO: A mensagem foi cifrada com uma chave fraca na cifragem sim�trica.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problema ao tratar pacote cifrado\n"
@@@ -2229,137 -1761,109 +2255,137 @@@ 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:79
++#: g10/export.c:78
#, 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:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "chave secreta n�o utiliz�vel"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ignorado: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[Utilizador n�o encontrado]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "mostra impress�o digital"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOME|usar NOME como chave secreta por omiss�o"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOME|usar NOME como chave secreta por omiss�o"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "fazer uma assinatura separada"
@@@ -2369,11 -1872,9 +2395,11 @@@
msgid "make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifrar dados"
@@@ -2381,15 -1881,12 +2407,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "cifrar apenas com cifra sim�trica"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "decifrar dados (ac��o por omiss�o)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verificar uma assinatura"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "listar as chaves"
@@@ -2402,15 -1897,12 +2428,15 @@@ msgstr "listar as chaves e as assinatur
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "listar as chaves secretas"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
@@@ -2434,7 -1922,6 +2460,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "remover chaves do porta-chaves p�blico"
@@@ -2466,7 -1947,6 +2492,7 @@@ msgstr "assinar uma chave localmente
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "muda a frase secreta"
@@@ -2516,24 -1985,19 +2542,24 @@@ msgstr "actualizar a base de dados de c
msgid "print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
@@@ -2551,12 -2013,10 +2577,12 @@@ msgstr "
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
@@@ -2568,7 -2026,6 +2594,7 @@@ msgstr "perguntar antes de sobrep�r
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2576,7 -2033,6 +2602,7 @@@ msgstr "
"@\n"
"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2596,13 -2052,11 +2622,13 @@@ msgstr "
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2617,7 -2071,6 +2643,7 @@@ msgstr "
"assina, verifica, cifra ou decifra\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2625,601 -2078,472 +2651,601 @@@ msgstr "
"\n"
"Algoritmos suportados:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Chave p�blica: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Dispers�o: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Compress�o: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [op��es] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, 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:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, 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:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "criado um novo ficheiro de configura��o `%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostrar em que porta-chave a chave est�"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "desactiva uma chave"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, 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:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, 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:3265
++#: g10/gpg.c:3272
#, 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:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sobrep�e %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
#, 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:3517
++#: g10/gpg.c:3524
#, 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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "prefer�ncias por omiss�o inv�lidas\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, 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:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [nome_do_ficheiro]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [nome_do_ficheiro]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nome_do_ficheiro]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_ficheiro]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizador"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizador"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizador [comandos]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-utilizador"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
msgid "export as ssh key failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, 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:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[nome_do_ficheiro]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
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:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@@ -3234,7 -2556,6 +3260,7 @@@ msgstr "Remover esta chave do porta-cha
msgid "make timestamp conflicts only a warning"
msgstr "conflito de \"timestamp\""
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr ""
"|DF|escrever informa��es de estado para o\n"
@@@ -3261,326 -2578,260 +3287,326 @@@ msgstr "Nenhuma ajuda dispon�vel
msgid "No help available for '%s'"
msgstr "Nenhuma ajuda dispon�vel para `%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualizar a base de dados de confian�a"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualizar a base de dados de confian�a"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chave secreta n�o utiliz�vel"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignorando bloco do tipo %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves processadas at� agora\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total processado: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ignorei novas chaves: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorei novas chaves: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sem IDs de utilizadores: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importados: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " n�o modificados: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de utilizadores: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas subchaves: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas assinaturas: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revoga��es de chaves: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chaves secretas importadas: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " chaves secretas n�o modificadas: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " n�o importadas: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas assinaturas: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ignorado `%s': %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: chave nova - ignorada\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, 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:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, 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:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, 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:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" n�o modificada\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3595,202 -2846,180 +3621,222 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, 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:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: liga��o de subchave inv�lida\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, 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:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, 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:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: ignorado ID de utilizador '"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: subchave ignorada\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "porta-chaves `%s' criado\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "porta-chaves `%s' criado\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revoga��o]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[auto-assinatura]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d assinaturas incorrectas\n"
- msgstr[1] "%d assinaturas incorrectas\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "assinatura %s de: \"%s\"\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "Assinatura correcta de \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "ignorado `%s': %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Utilizador \"%s\" est� revocado."
+ msgstr[1] "Utilizador \"%s\" est� revocado."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3798,23 -3027,25 +3844,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 assinatura n�o verificada por falta de chave\n"
msgstr[1] "1 assinatura n�o verificada por falta de chave\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 assinatura n�o verificada devido a um erro\n"
- msgstr[1] "1 assinatura n�o verificada devido a um erro\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d assinaturas incorrectas\n"
+ msgstr[1] "%d assinaturas incorrectas\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
- msgstr[1] "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Assinatura correcta de \""
+ msgstr[1] "Assinatura correcta de \""
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3827,68 -3058,53 +3879,68 @@@ msgstr "
"(vendo passaportes, verificando impress�es digitais...)?\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Confio moderadamente\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Confio plenamente\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " N�o foi poss�vel assinar.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, 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:722
++#: g10/keyedit.c:1235
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Realmente assinar? "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3897,11 -3113,9 +3949,11 @@@ msgstr "
"A sua auto-assinatura em \"%s\"\n"
"� uma assinatura do tipo PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3910,12 -3124,10 +3962,12 @@@ msgstr "
"A sua assinatura actual em \"%s\"\n"
"� uma assinatura local.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
#, 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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3924,44 -3136,35 +3976,44 @@@ msgstr "
"A sua assinatura actual em \"%s\"\n"
"� uma assinatura local.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
#, 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:855
++#: g10/keyedit.c:1368
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada para assinar com a chave %08lX\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Esta chave expirou!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave vai expirar em %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3971,32 -3174,26 +4023,32 @@@ msgstr "
"pertence\n"
"� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) N�o vou responder.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) N�o verifiquei.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Verifiquei por alto.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Verifiquei com bastante cuidado.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr " i = mostrar mais informa��es\n"
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4005,272 -3202,214 +4057,268 @@@ msgstr "
"Voc� tem certeza de que quer assinar esta chave com\n"
"a sua chave: \""
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Isto ser� uma auto-assinatura.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, 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:1010
++#: g10/keyedit.c:1523
#, 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:1020
++#: g10/keyedit.c:1533
#, 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:1027
++#: g10/keyedit.c:1540
#, 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:1034
++#: g10/keyedit.c:1547
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"N�o verifiquei esta chave.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Verifiquei por alto esta chave.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Verifiquei esta chave com muito cuidado.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Realmente assinar? "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- 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:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "gravar e sair"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra impress�o digital"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Nota��o de assinatura: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "lista chave e identificadores de utilizadores"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "seleciona ID de utilizador N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "seleciona ID de utilizador N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "revoga assinaturas"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "assina a chave localmente"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "adiciona um novo ID de utilizador"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "adiciona um identificador fotogr�fico"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "remove ID de utilizador"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "remove uma chave secund�ria"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "adiciona uma chave de revoca��o"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
#, 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:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "seleccionar o identificador do utilizador como prim�rio"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "lista prefer�ncias (perito)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "lista prefer�ncias (detalhadamente)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
#, 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:1443
++#: g10/keyedit.c:1909
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "muda a frase secreta"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "muda os valores de confian�a"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revocar um ID de utilizador"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoga uma chave secund�ria"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "activa uma chave"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "desactiva uma chave"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostrar identificador fotogr�fico"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Chave secreta dispon�vel.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta � necess�ria para fazer isto.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4278,268 -3417,216 +4326,274 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "A chave est� revogada."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Realmente assinar todos os IDs de utilizador? "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Realmente assinar todos os IDs de utilizador? "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "classe de assinatura desconhecida"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
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:1853
++#: g10/keyedit.c:2319
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Realmente remover este ID de utilizador? "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Voc� quer realmente remover as chaves selecionadas? "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Voc� quer realmente remover esta chave? "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Realmente revocar este ID de utilizador? "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Voc� quer realmente revogar esta chave? "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Voc� quer realmente revogar as chaves selecionadas? "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Voc� quer realmente revogar esta chave? "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "configurar lista de prefer�ncias"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, 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:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Realmente actualizar as prefer�ncias?"
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Gravar altera��es? "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Sair sem gravar? "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, 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:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "valor inv�lido\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Identificador de utilizador inexistente.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nada para assinar com a chave %08lX\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "'Digest': "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Caracter�sticas: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Nota��o: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr " (sens�vel)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "imposs�vel criar %s: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "revkey"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr "[expira: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr "[expira: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, fuzzy, c-format
msgid "usage: %s"
msgstr " confian�a: %c/%c"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confian�a: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Esta chave foi desactivada"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4547,35 -3634,27 +4601,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "revkey"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4584,36 -3663,28 +4638,36 @@@ msgstr "
"AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
" algumas vers�o do PGP podem rejeit�-la.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Apagar esta assinatura v�lida? (s/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Realmente remover esta auto-assinatura? (s/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4621,38 -3692,31 +4675,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d assinatura removida.\n"
msgstr[1] "%d assinatura removida.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Nada removido.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
#, fuzzy
msgid "invalid"
msgstr "armadura inv�lida"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "Utilizador \"%s\" est� revocado."
msgstr[1] "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4661,275 -3725,217 +4715,275 @@@ 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:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Insira o ID de utilizador do revogador escolhido: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
#, 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:3961
++#: g10/keyedit.c:4479
#, 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:3967
++#: g10/keyedit.c:4485
#, 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:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, 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:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificar a data de validade para uma chave prim�ria.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Seleccione exactamente um identificador de utilizador.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, 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:4557
++#: g10/keyedit.c:5181
#, 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:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Nota��o de assinatura: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Escrever por cima (s/N)? "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de utilizador: \""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (n�o-export�vel)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
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:5178
++#: g10/keyedit.c:5802
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:5232
++#: g10/keyedit.c:5856
#, fuzzy
msgid "Not signed by you.\n"
msgstr " assinado por %08lX em %s%s\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Assinou estes identificadores de utilizadores:\n"
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr " (n�o-export�vel)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revogado por %08lX em %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Est� prestes a revogar estas assinaturas:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realmente criar os certificados de revoga��o? (s/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "prefer�ncia %c%lu duplicada\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "demasiadas prefer�ncias `%c'\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "demasiadas prefer�ncias `%c'\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "demasiadas prefer�ncias `%c'\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "a escrever a assinatura directa\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "a escrever a auto-assinatura\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "a escrever a assinatura ligada a uma chave\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamanho da chave arredondado para %u bits\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "cifrar dados"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -4943,157 -3949,126 +4997,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (apenas cifragem)\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA e ElGamal (por omiss�o)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA e ElGamal (por omiss�o)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (apenas assinatura)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (apenas cifragem)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA e ElGamal (por omiss�o)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Nota��o de assinatura: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamanho de chave pedido � %u bits\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "arredondado para %u bits\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5109,7 -4084,6 +5163,7 @@@ msgstr "
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5125,40 -4099,32 +5179,40 @@@ msgstr "
" <n>m = assinatura expira em n meses\n"
" <n>y = assinatura expira em n anos\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "A chave � valida por? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "A assinatura � valida por? (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "valor inv�lido\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "A %s n�o expira nunca\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "A %s n�o expira nunca\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s expira em %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5166,12 -4132,10 +5220,12 @@@ msgstr "
"O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
"No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Est� correto (s/n)? "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5182,7 -4146,6 +5236,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5200,50 -4163,39 +5254,50 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Nome completo: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Caracter inv�lido no nome\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
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:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Endere�o de correio eletr�nico: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Endere�o eletr�nico inv�lido\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Coment�rio: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Caracter inv�lido no coment�rio\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5254,7 -4206,6 +5308,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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 "
@@@ -5271,35 -4222,28 +5325,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Por favor corrija primeiro o erro\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5311,12 -4255,10 +5365,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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5324,68 -4266,55 +5378,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "%s' j� comprimido\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Criar mesmo assim?"
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Criar mesmo assim?"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Gera��o de chave cancelada.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: chave secreta %08lX expirou em %s\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, 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:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "chaves p�blica e privada criadas e assinadas.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5394,7 -4323,6 +5448,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:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5402,7 -4330,6 +5456,7 @@@ msgstr "
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5410,51 -4337,40 +5464,51 @@@ msgstr "
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
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:4298
++#: g10/keygen.c:4324
#, 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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr ""
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Politica de assinatura cr�tica: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Politica de assinatura: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Nota��o de assinatura cr�tica: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Nota��o de assinatura: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5462,69 -4378,63 +5516,77 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d assinaturas incorrectas\n"
msgstr[1] "%d assinaturas incorrectas\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 assinatura n�o verificada devido a um erro\n"
+ msgstr[1] "1 assinatura n�o verificada devido a um erro\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Porta-chaves"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "ignorado `%s': %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Impress�o da chave prim�ria:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr "Impress�o da chave prim�ria:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Impress�o da subchave:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impress�o da chave ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "a verificar o porta chaves `%s'\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu chave verificadas (%lu assinaturas)\n"
msgstr[1] "%lu chave verificadas (%lu assinaturas)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5532,530 -4442,423 +5594,530 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 assinatura incorrecta\n"
msgstr[1] "1 assinatura incorrecta\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: porta-chaves criado\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, 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:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "a pedir a chave %08lX de %s\n"
msgstr[1] "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"assinado com a sua chave %08lX em %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, fuzzy, c-format
msgid "%s encrypted session key\n"
msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "cifrado com algoritmo desconhecido %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "a chave p�blica � %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ou \""
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrado com chave %s, ID %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decifragem de chave p�blica falhou: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, fuzzy, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "Repita a frase secreta\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
#, fuzzy
msgid "encrypted with 1 passphrase\n"
msgstr "Repita a frase secreta\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "a assumir dados cifrados %s\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "Cifra IDEO n�o dispon�vel, a tentar utilizar %s em substitui��o\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "decifragem correcta\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome do ficheiro original='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "Assinatura correcta de \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Assinatura INCORRECTA de \""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Assinatura expirada de \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Assinatura correcta de \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "verifica��o de assinatura suprimida\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ou \""
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
#, fuzzy
msgid "Key available at: "
msgstr "Nenhuma ajuda dispon�vel"
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[incerto]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ou \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
#, fuzzy
msgid "binary"
msgstr "primary"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr ""
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
#, fuzzy
msgid "unknown"
msgstr "vers�o desconhecida"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo de chave p�blica desconhecido"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposs�vel verificar assinatura: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "n�o � uma assinatura separada\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "assinatura de classe 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "formato de assinatura antigo (PGP2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, 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:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
#, 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:302
++#: g10/misc.c:300
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "algoritmo de criptografia n�o implementado"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, 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:355
++#: g10/misc.c:353
#, fuzzy, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/misc.c:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "armadura: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "armadura: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: op��o depreciada \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "por favor utilize \"%s%s\" em vez dela\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
#, fuzzy
msgid "Uncompressed"
msgstr "n�o processado"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "n�o processado"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "a ler op��es de `%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "classe de assinatura desconhecida"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Arquivo `%s' j� existe. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Escrever por cima (s/N)? "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: sufixo desconhecido\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Digite novo nome de ficheiro"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "a escrever em \"stdout\"\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "a assumir dados assinados em `%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "criado um novo ficheiro de configura��o `%s'\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problema com o agente: o agente returnou 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID principal da chave %08lX)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6070,15 -4873,12 +6132,15 @@@ msgstr "
"\"%.*s\"\n"
"chave %u bits %s, ID %08lx, criada %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Insira a frase secreta\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "cancelado pelo utilizador\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6088,47 -4888,38 +6150,47 @@@ msgstr "
"Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
"utilizador: \""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Por favor digite a frase secreta \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Por favor digite a frase secreta \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Por favor digite a frase secreta \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Por favor digite a frase secreta \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Voc� quer realmente remover as chaves selecionadas? "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Voc� quer realmente remover as chaves selecionadas? "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6181,31 -4964,24 +6243,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Nenhum motivo especificado"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "A chave foi substitu�da"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "A chave foi comprometida"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "A chave j� n�o � utilizada"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "O identificador do utilizador j� n�o � v�lido"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "motivo da revoca��o: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "coment�rio da revoca��o: "
@@@ -6219,100 -4995,81 +6281,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, fuzzy
msgid "No trust value assigned to:\n"
msgstr ""
"Nenhum valor de confian�a designado para:\n"
"%4u%c/%08lX %s \""
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " ou \""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, 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:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = N�o sei\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Eu N�O confio\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Confio de forma total\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = voltar ao menu principal\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = saltar esta chave\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " q = sair\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Decis�o? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, 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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificados que levam a uma chave confiada plenamente:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Esta chave provavelmente pertence ao dono\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Esta chave pertence-nos\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6324,134 -5081,106 +6386,134 @@@ msgstr "
"sim � pr�xima pergunta\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Usar esta chave de qualquer modo? "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "AVISO: A utilizar uma chave que n�o � de confian�a!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
#, 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:547
++#: g10/pkclist.c:562
#, 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:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
#, fuzzy
msgid " This could mean that the signature is forged.\n"
msgstr " Isto pode significar que a assinatura � falsificada.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta chave foi desactivada.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Nota: Esta chave expirou!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " A assinatura � provavelmente uma FALSIFICA��O.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "imposs�vel ligar a `%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6459,168 -5188,132 +6521,168 @@@ msgstr "
"\n"
"Insira o identificador do utilizador. Termine com uma linha vazia: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Identificador de utilizador inexistente.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "A chave p�blica est� desativada.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "ignorado: a chave p�blica j� est� presente\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "nenhum endere�o v�lido\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Assinatura separada.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Por favor digite o nome do ficheiro de dados: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "lendo do \"stdin\" ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "n�o h� dados assinados\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "imposs�vel abrir dados assinados `%s'\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinat�rio an�nimo; a tentar chave secreta %08lX ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "codifica��o antiga do DEK n�o suportada\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "algoritmo de cifra %d%s � desconhecido ou foi desactivado\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "NOTA: algoritmo de cifragem %d n�o encontrado nas prefer�ncias\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "NOTA: chave secreta %08lX expirou em %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, fuzzy, c-format
msgid "build_packet failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr ""
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr ""
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "Chave secreta dispon�vel.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
#, 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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr ""
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, fuzzy, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
#, fuzzy
msgid "Revocation certificate created.\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6629,19 -5322,16 +6691,19 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "chave `%s' n�o encontrada: %s\n"
@@@ -6649,23 -5339,19 +6711,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, 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:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6676,96 -5362,78 +6738,96 @@@
"your machine might store the data and make it available to others!\n"
msgstr ""
- #: g10/revoke.c:770
++#: g10/revoke.c:769
#, fuzzy
msgid "Please select the reason for the revocation:\n"
msgstr "motivo da revoca��o: "
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr ""
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
- #: g10/revoke.c:823
++#: g10/revoke.c:822
#, 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:851
++#: g10/revoke.c:850
#, fuzzy, c-format
msgid "Reason for revocation: %s\n"
msgstr "motivo da revoca��o: "
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr ""
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Usar esta chave de qualquer modo? "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "chave fraca criada - tentando novamente\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"imposs�vel evitar chave fraca para criptografia sim�trica;\n"
"tentei %d vezes!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostrar mais informa��es\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
msgstr[1] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
msgstr[1] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6778,7 -5446,6 +6840,7 @@@ msgstr[1] "
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6790,41 -5457,34 +6852,41 @@@ msgstr[1] "
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, fuzzy, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOTA: a chave foi revogada"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande). A "
"utilizar n�o expandida.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6832,7 -5492,6 +6894,7 @@@ msgstr "
"AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
"A utilizar n�o expandida.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6841,12 -5500,10 +6903,12 @@@ msgstr "
"AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
"A utilizar n�o expandida.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6854,382 -5511,308 +6916,382 @@@ msgstr "
"for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
"destinat�rio\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "a assinar:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "ser� utilizada a cifragem %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "ignorado `%s': duplicada\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
"# (Use \"gpg --import-ownertrust\" to restore them)\n"
msgstr ""
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "frase secreta demasiado longa\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr "importar os valores de confian�a"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "armadura: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "imposs�vel abrir `%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
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:606
- #, fuzzy, c-format
- msgid "can't access '%s': %s\n"
- msgstr "imposs�vel fechar `%s': %s\n"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: diretoria inexistente!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, fuzzy, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "imposs�vel fechar `%s': %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: falha ao criar registo de vers�o: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: base de dados de confian�a inv�lida criada\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: base de dados de confian�a criada\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "NOTA: n�o � poss�vel escrever na trustdb\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: base de dados de confian�a inv�lida\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: erro a actualizar registo de vers�o: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: erro ao ler registo de vers�o: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: erro ao escrever registo de vers�o: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de dados de confian�a: lseek falhou: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: n�o � um base de dados de confian�a\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: registo de vers�o com recnum %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: erro ao ler registo livre: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: falha ao zerar um registo: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: falha ao anexar um registo: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: base de dados de confian�a criada\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "linha de entrada maior que %d caracteres\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmos suportados:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "chave p�blica %08lX n�o encontrada: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Pol�tica: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "listar as chaves"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7239,175 -5822,155 +7301,186 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "chave %08lX: aceite como chave de confian�a\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "chave marcada como de confian�a absoluta\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7416,7 -5978,6 +7489,7 @@@
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:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
@@@ -7465,34 -6018,27 +7538,34 @@@ msgid "public key of ultimately truste
msgstr ""
"chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, 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"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr ""
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7504,42 -6050,33 +7577,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "revkey"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "expire"
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "vers�o desconhecida"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7549,12 -6086,10 +7622,12 @@@ msgstr "
"N�o se esque�a que o ficheiro com a assinatura (.sig ou .asc)\n"
"deve ser o primeiro a ser dado na linha de comando.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
@@@ -7883,7 -6350,6 +7956,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8028,9 -6464,6 +8101,9 @@@ msgstr "erro na cria��o da frase secret
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
@@@ -8540,7 -6868,6 +8613,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "erro na leitura do bloco de chave: %s\n"
@@@ -8565,136 -6888,106 +8638,136 @@@ msgstr "remo��o do bloco de chave falho
msgid "no valid recipients given\n"
msgstr "resposta do agente inv�lida\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "listar as chaves secretas"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "certificado incorrecto"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "certificado incorrecto"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "certificado incorrecto"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "criar sa�da com armadura ascii"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "nunca usar o terminal"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "modo n�o-interactivo: nunca perguntar"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "assumir n�o para a maioria das perguntas"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr ""
"adicionar este porta-chaves\n"
"� lista de porta-chaves"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|usar NOME como chave secreta por omiss�o"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ENDERE�O|usar este servidor para buscar chaves"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usar algoritmo de criptografia NOME"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8705,47 -6998,38 +8778,47 @@@ msgstr "
"assina, verifica, cifra ou decifra\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "imposs�vel ligar a `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = saltar esta chave\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "a escrever para `%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "imposs�vel fechar `%s': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8763,7 -7044,6 +8836,7 @@@ msgstr "gerar um certificado de revoga�
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
@@@ -8778,32 -7056,26 +8851,32 @@@ msgstr "erro na cria��o da frase secret
msgid "error reading input: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? problema ao verificar revoga��o: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -8981,7 -7220,6 +9054,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
@@@ -8991,8 -7228,6 +9064,8 @@@
msgid "certificate cached\n"
msgstr "prefer�ncia %c%lu duplicada\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
@@@ -9597,13 -7709,11 +9670,13 @@@ msgstr "certificado incorrecto
msgid "force the use of the default OCSP responder"
msgstr "Insira o ID de utilizador do revogador escolhido: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9611,85 -7721,69 +9684,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "prefer�ncia %c%lu duplicada\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "NOTA: a chave foi revogada"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritmos suportados:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9844,12 -7904,10 +9917,12 @@@ msgstr "uso: gpg [op��es]
msgid "colons are not allowed in the socket name\n"
msgstr "%s n�o � permitido com %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
@@@ -10345,77 -8301,61 +10418,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/ro.po
index 9c5754a,79d9bae..f0e7a7d
--- a/po/ro.po
+++ b/po/ro.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz at rolix.org>\n"
"Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@@ -105,8 -89,6 +105,8 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "fraz�-parol� incorect�"
@@@ -162,25 -133,11 +162,25 @@@ msgstr "fraz�-parol� incorect�
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "nu pot crea `%s': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
#, 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:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
#, fuzzy
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -397,8 -315,6 +397,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "schimb� fraza-parol�"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -408,118 -324,87 +408,118 @@@ msgstr "
"Op�iuni:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "locvace"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "fii oarecum mai t�cut"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "caut� pentru chei pe un server de chei"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualizeaz� baza de date de �ncredere"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nu este suportat(�)"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -528,165 -413,125 +528,170 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "director `%s' creat\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
+
++#: agent/gpg-agent.c:1964
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) a e�uat �n %s: %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: nu pot crea director: %s\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: s�rit�: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -702,8 -545,6 +707,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -711,9 -552,6 +716,9 @@@ msgstr "
"@Comenzi:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -723,36 -561,30 +728,36 @@@ msgstr "
"Op�iuni:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
@@@ -760,12 -592,10 +765,12 @@@
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "anulat�"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
@@@ -829,8 -649,6 +834,8 @@@ msgstr "
msgid "Yes"
msgstr "da"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -860,28 -675,23 +865,28 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "schimb� fraza-parol�"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -889,19 -699,16 +894,19 @@@
"%%0A?"
msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "activeaz� cheia"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -942,53 -742,42 +947,57 @@@ msgstr "algoritm de protec�ie %d%s nu e
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "algoritm de protec�ie %d%s nu este suportat\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eroare la citire `%s': %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "actualizarea a e�uat: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "eroare la citire `%s': %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "eroare la citire `%s': %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "eroare la citire `%s': %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -1003,17 -790,18 +1012,22 @@@ msgstr "probleme de comunicare cu gpg-a
msgid "problem setting the gpg-agent options\n"
msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "anulat� de utilizator\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
@@@ -1083,17 -857,18 +1097,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 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"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1423,7 -1131,6 +1442,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "nefor�at(�)"
@@@ -1433,22 -1139,14 +1452,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "op�iuni enumerare invalide\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "a�i g�sit un bug ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "nu pot deschide fi�ierul: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
@@@ -1487,87 -1178,73 +1501,93 @@@ msgstr "cheia public� %s nu a fost g�si
msgid "waiting for lock %s...\n"
msgstr "scriu cheia secret� �n `%s'\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "armur�: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "header armur� invalid: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "header armur�: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "header clearsig invalid\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "header armur�: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "semn�turi text �n clar �ncuib�rite\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "armur� nea�teptat�: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "linie cu liniu�� escape invalid�: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter radix64 invalid %02X s�rit\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "eof prematur (nici un CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "eof prematur (�n CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "CRC anormal\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "eroare CRC; %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "eof prematur (�n trailer)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "eroare linia de trailer\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA "
"cu bug-uri\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "ilizibil"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1575,83 -1252,73 +1595,95 @@@ msgstr "
"un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
"�i s� se termine cu un '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr ""
"o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
+ "�i s� se termine cu un '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "ilizibil"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Introduce�i fraza-parol�: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: "
msgid "WARNING: %s\n"
msgstr "AVERTISMENT: "
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "nu pot face acest lucru �n modul batch\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Selec�ia d-voastr�? "
@@@ -1713,21 -1366,11 +1745,16 @@@ msgstr "URL pentru a aduce cheia public
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
@@@ -1818,13 -1442,10 +1845,13 @@@ msgstr "Ce lungime de cheie dori�i? (%u
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Ce lungime de cheie dori�i? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: 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:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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"
@@@ -1883,9 -1494,6 +1910,9 @@@ msgstr " (2) Cheie de cifrare\n
msgid " (3) Authentication key\n"
msgstr " (3) Cheie de autentificare\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Selec�ie invalid�.\n"
@@@ -1919,7 -1521,6 +1946,7 @@@ msgstr "Dori�i s�-l semna�i? (d/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "ie�i din acest meniu"
@@@ -1927,7 -1527,6 +1954,7 @@@
msgid "show admin commands"
msgstr "arat� comenzi administrare"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "afi�eaz� acest mesaj"
@@@ -2003,125 -1584,96 +2030,125 @@@ msgstr "Sunt permise comenzi administra
msgid "Admin commands are not allowed\n"
msgstr "Nu sunt permise comenzi administrare\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Comand� invalid� (�ncerca�i \"ajutor\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output nu merge pentru aceast� comand�\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nu pot deschide `%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eroare la citire keyblock: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(dac� nu specifica�i cheia prin amprent�)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
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:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "�terge aceast� cheie din inelul de chei? (d/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
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:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "cheie"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Pubkey: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "informa�ii �ncredere-proprietar cur��ate\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "nu pot crea un pachet ESK simetric datorit� modului S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "folosesc cifrul %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' deja compresat\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "citesc din `%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2129,7 -1681,6 +2156,7 @@@ msgstr "
"AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
"destinatarului\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2138,38 -1689,31 +2165,38 @@@ msgstr "
"AVERTISMENT: for��nd algoritmul de compresie %s (%d) viola�i preferin�ele "
"destinatarului\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, 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"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrat pentru: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, 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"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s date cifrate\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrat cu un algoritm necunoscut %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"AVERTISMENT: mesajul a fost cifrat cu o cheie slab� din cifrul simetric.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problem� cu m�nuirea pachetului cifrat\n"
@@@ -2232,134 -1765,106 +2259,134 @@@ 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:79
++#: g10/export.c:78
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "cheie secret� de nefolosit"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: s�rit�: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "exportul cheilor secrete nu este permis\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "AVERTISMENT: nimic exportat\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "eroare la creearea `%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[ID utilizator nu a fost g�sit]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "op�iuni enumerare invalide\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "eroare �n `%s': %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "eroare la creearea `%s': %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "eroare la creearea `%s': %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "Amprenta CA: "
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "|[fi�ier]|creaz� o semn�tur�"
@@@ -2369,11 -1873,9 +2396,11 @@@
msgid "make a clear text signature"
msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "creaz� o semn�tur� deta�at�"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifreaz� datele"
@@@ -2381,15 -1882,12 +2408,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "cifreaz� numai cu cifru simetric"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "decripteaz� datele (implicit)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verific� o semn�tur�"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "enumer� chei"
@@@ -2401,15 -1897,12 +2428,15 @@@ msgstr "enumer� chei �i semn�turi
msgid "list and check key signatures"
msgstr "enumer� �i verific� semn�turile cheii"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "enumer� chei �i amprente"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "enumer� chei secrete"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genereaz� o nou� perechi de chei"
@@@ -2433,7 -1922,6 +2460,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "genereaz� un certificat de revocare"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "�terge chei de pe inelul de chei public"
@@@ -2465,7 -1947,6 +2492,7 @@@ msgstr "semneaz� o cheie local
msgid "sign or edit a key"
msgstr "semneaz� sau editeaz� o cheie"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "schimb� fraza-parol�"
@@@ -2515,24 -1985,19 +2542,24 @@@ msgstr "actualizeaz� baza de date de �n
msgid "print message digests"
msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "creaz� ie�ire �n armur� ascii"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NUME|cifrare pentru NUME"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
@@@ -2546,12 -2009,10 +2573,12 @@@ msgstr "|N|seteaz� nivel de compresie
msgid "use canonical text mode"
msgstr "folose�te modul text canonic"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
@@@ -2563,7 -2022,6 +2590,7 @@@ msgstr "�ntreab� �nainte de a suprascri
msgid "use strict OpenPGP behavior"
msgstr "folose�te comportament strict OpenPGP"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2571,7 -2029,6 +2598,7 @@@ msgstr "
"@\n"
"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2591,13 -2048,11 +2618,13 @@@ msgstr "
" --list-keys [nume] arat� chei\n"
" --fingerprint [nume] arat� amprente\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2612,7 -2067,6 +2639,7 @@@ msgstr "
"sign, check, encrypt sau decrypt\n"
"opera�iunea implicit� depinde de datele de intrare\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2620,78 -2074,64 +2647,78 @@@ msgstr "
"\n"
"Algoritmuri suportate:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Cifru: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Compresie: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "folosire: gpg [op�iuni] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comenzi �n conflict\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2699,7 -2139,6 +2726,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1537
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2709,7 -2148,6 +2736,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
"configurare `%s'\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2717,7 -2155,6 +2744,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1546
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2725,7 -2162,6 +2752,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1549
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2736,7 -2172,6 +2763,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
"configurare `%s'\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2744,510 -2179,400 +2771,510 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "articol configurare necunoscut `%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, 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:1887
++#: g10/gpg.c:1890
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "deactiveaz� cheia"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "op�iune necunoscut� `%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "op�iune necunoscut� `%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op�iuni server de chei invalide\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "op�iuni server de chei invalide\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op�iuni import invalide\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "op�iuni import invalide\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op�iuni export invalide\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "op�iuni export invalide\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op�iuni enumerare invalide\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "op�iuni enumerare invalide\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "op�iuni verificare invalide\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nu pot seta cale-execu�ie ca %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s nu este permis cu %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "algoritm compresie selectat este invalid\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritm rezumat certificare selectat este invalid\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "preferin�e implicite invalide\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "preferin�e cifrare personale invalide\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "preferin�e rezumat personale invalide\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "preferin�e compresie personale invalide\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge �nc� cu %s!\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [nume_fi�ier]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [nume_fi�ier]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, 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:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [nume_fi�ier]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
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:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [nume_fi�ier]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
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:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nume_fi�ier]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [nume_fi�ier]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [nume_fi�ier]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizator"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizator"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizator [comenzi]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-utilizator"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "trimitere server de chei e�uat�: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recep�ie server de chei e�uat�: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "export cheie e�uat: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "export cheie e�uat: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "c�utare server de chei e�uat�: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualizare server de chei e�uat�: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminarea armurii a e�uat: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "punerea armurii a e�uat: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[nume_fi�ier]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "URL-ul politicii de certificare furnizat este invalid\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@@ -3260,7 -2583,6 +3287,7 @@@ msgstr "ia cheile de pe acest inel de c
msgid "make timestamp conflicts only a warning"
msgstr "d� numai un avertisment la conflicte de timestamp"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|scrie informa�ii de stare �n acest FD"
@@@ -3287,330 -2605,264 +3314,330 @@@ msgstr "Nici un ajutor disponibil
msgid "No help available for '%s'"
msgstr "Nici un disponibil disponibil pentru `%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualizeaz� baza de date de �ncredere"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualizeaz� baza de date de �ncredere"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "cheie secret� de nefolosit"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "bloc de tip %d s�rit\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chei procesate p�n� acum\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Num�r total procesate: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " chei noi s�rite: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " chei noi s�rite: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " f�r� ID-uri utilizator: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " neschimbate: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " noi ID-uri utilizator: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " noi subchei: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " noi semn�turi: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " noi revoc�ri de chei: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chei secrete citite: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chei secrete importate: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chei secrete neschimbate: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ne importate: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr "semn�turi create p�n� acum: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chei secrete citite: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, fuzzy, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm de cifrare %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm rezumat %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm compresie %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
"este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
"algoritm\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "cheia %s: nici un ID utilizator\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "s�rit� \"%s\": %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "cheia %s: nici un ID utilizator valid\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "cheia %s: cheie nou� - s�rit�\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, 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:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "cheia %s: cheia public� \"%s\" importat�\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, 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:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "cheia %s: \"%s\" %d noi subchei\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, 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:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "cheia %s: cheie secret� importat�\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, 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:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "importul de chei secrete nu este permis\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3625,201 -2877,182 +3652,224 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, 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:2058
++#: g10/import.c:2057
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "cheia %s: legare subcheie invalid�\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "cheia %s: revocare de subcheie invalid�\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "cheia %s: am s�rit subcheia\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "inelul de chei `%s' creat\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "inelul de chei `%s' creat\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "resurs� keyblock `%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "eroare �n `%s': %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, 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:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revocare]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[auto-semn�tur�]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d semn�turi incorecte\n"
- msgstr[1] "%d semn�turi incorecte\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "semn�tur� %s, algoritm rezumat %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "revoke signatures"
+ msgid " (reordered signatures follow)"
+ msgstr "revoc� semn�turi"
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "skipped \"%s\": %s\n"
+ msgid "key %s:\n"
+ msgstr "s�rit� \"%s\": %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "ID utilizator \"%s\" a fost revocat."
+ msgstr[1] "ID utilizator \"%s\" a fost revocat."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3827,23 -3060,25 +3877,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
msgstr[1] "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
- msgstr[1] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d semn�turi incorecte\n"
+ msgstr[1] "%d semn�turi incorecte\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
- msgstr[1] "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Semn�tur� bun� din \"%s\""
+ msgstr[1] "Semn�tur� bun� din \"%s\""
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3854,17 -3089,14 +3910,17 @@@ msgstr "
"pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
"verific�nd amprentele din diferite surse, etc.)\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Am o �ncredere marginal�\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Am toat� �ncrederea\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3874,52 -3106,40 +3930,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:501
++#: g10/keyedit.c:1014
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:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Nu pot semna.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ID utilizator \"%s\" este expirat."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID-ul utilizator \"%s\" poate fi semnat. "
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "Dori�i s�-l semna�i? (d/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3928,11 -3148,9 +3984,11 @@@ msgstr "
"Auto-semn�tura pe \"%s\"\n"
"este o semn�tur� stil PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3941,12 -3159,10 +3997,12 @@@ msgstr "
"Semn�tura d-voastr� curent� pe \"%s\"\n"
"a expirat.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3955,43 -3171,34 +4011,43 @@@ msgstr "
"Semn�tura d-voastr� curent� pe \"%s\"\n"
"semn�tur� local�.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
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:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nimic de semnat cu cheia %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Aceast� cheie a expirat!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Aceast� cheie va expira pe %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4002,33 -3209,27 +4058,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:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nu voi r�spunde.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Nu am verificat deloc.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, 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:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
#, 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:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4037,232 -3238,174 +4093,228 @@@ msgstr "
"Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
"aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Aceasta va fi o auto-semn�tur�.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "Nu am verificat aceast� cheie deloc.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "Am verificat aceast� cheie superficial.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "Am verificat aceast� cheie foarte atent.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
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:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "mut o semn�tur� de cheie �n locul corect\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "salveaz� �i termin�"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "afi�eaz� amprenta cheii"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Notare semn�tur�: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "enumer� chei �i ID-uri utilizator"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "selecteaz� ID utilizator N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "selecteaz� subcheia N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "verific� semn�turi"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
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:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
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:1407
++#: g10/keyedit.c:1873
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:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "adaug� un ID utilizator"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "adaug� o poz� ID"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "�terge ID-urile utilizator selectate"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "adaug� o subcheie"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "adaug� o cheie la un smartcard"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "mut� o cheie pe un smartcard"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "mut� o cheie de rezerv� pe un smartcard"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "�terge subcheile selectate"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "adaug� o cheie de revocare"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
msgid "change the expiration date for the key or selected subkeys"
msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "marcheaz� ID-ul utilizator selectat ca primar"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "enumer� preferin�ele (expert)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "afi�eaz� preferin�ele (detaliat)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
#, 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:1443
++#: g10/keyedit.c:1909
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "schimb� fraza-parol�"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "schimb� �ncrederea pentru proprietar"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "revoc� ID-urile utilizator selectate"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "revoc� cheia sau subcheile selectate"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "activeaz� cheia"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "deactiveaz� cheia"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "arat� pozele pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Cheia secret� este disponibil�.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4281,260 -3424,208 +4333,266 @@@ msgstr "
" pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
" (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Cheia este revocat�."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, 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:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, 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:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
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:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
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:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Trebuie s� selecta�i exact o cheie.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, 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:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
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:2031
++#: g10/keyedit.c:2497
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:2069
++#: g10/keyedit.c:2535
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:2070
++#: g10/keyedit.c:2536
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:2088
++#: g10/keyedit.c:2554
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:2099
++#: g10/keyedit.c:2565
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:2101
++#: g10/keyedit.c:2567
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:2150
++#: g10/keyedit.c:2625
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:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Seteaz� lista de preferin�e ca:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Salva�i schimb�rile? (d/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Termina�i f�r� a salva? (d/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
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:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "amprent� invalid�"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "am e�uat s� stochez amprenta: %s\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "valoare invalid�\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Nu exist� acest ID utilizator.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, 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:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Rezumat: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Capabilit��i: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "Server de chei no-modify"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Server de chei preferat: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Nota�ie:"
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr " (senzitiv)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "creat�: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "revocat�: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "expirat�: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "expir�: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "folosire: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "nr-card: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "�ncredere: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "validitate: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Aceast� cheie a fost deactivat�"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4543,17 -3634,12 +4601,17 @@@ msgstr "
"corect� dac� nu reporni�i programul.\n"
#
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "revocat�"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "expirat�"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4562,17 -3648,14 +4620,17 @@@ msgstr "
" Aceast� comand� poate cauza ca un alt ID utilizator\n"
" s� devin� ID-ul utilizator primar presupus.\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4581,35 -3664,27 +4639,35 @@@ msgstr "
"AVERTISMENT: Aceasta este o cheie stil PGP2. Ad�ugarea unei poze ID poate\n"
" cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4617,37 -3692,30 +4675,37 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Am �ters %d semn�turi.\n"
msgstr[1] "Am �ters %d semn�turi.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Nu am �ters nimic.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "invalid(�)"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "ID utilizator \"%s\" a fost revocat."
msgstr[1] "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4657,40 -3725,32 +4715,40 @@@ msgstr "
" desemnat poate face ca unele versiuni de PGP s� resping� "
"cheia.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
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:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4701,230 -3761,180 +4759,230 @@@ msgstr "
"Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
"desemnat? (d/N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "Schimb timpul de expirare pentru o subcheie.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "Introduce�i URL-ul serverului de chei preferat: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
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:4557
++#: g10/keyedit.c:5181
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:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Notare semn�tur�: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Suprascriu? (d/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nici un ID utilizator cu indicele %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Nici un ID utilizator cu hash-ul %s\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "Nici o subcheie cu indicele %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID utilizator: \"%s\"\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (non-exportabil�)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aceast� semn�tur� a expirat pe %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
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:5178
++#: g10/keyedit.c:5802
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:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (non-revocabil�)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revocat� de cheia d-voastr� %s pe %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
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:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "nici o cheie secret�\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Cheia %s este deja revocat�.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Subcheia %s este deja revocat�.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
msgstr "preferin�a `%s' duplicat�\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "prea multe preferin�e de cifrare\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "prea multe preferin�e de rezumat\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "prea multe preferin�e de compresie\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "articol invalid `%s' �n �irul de preferin�e\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "scriu semn�tur� direct�\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "scriu auto semn�tur�\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "scriu semn�tur� legat� de cheie\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "lungime cheie rotunjit� la %u bi�i\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Semneaz�"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Cifreaz�"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Autentific�"
@@@ -4938,158 -3948,127 +4996,158 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "SsCcAaTt"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Ac�iuni posibile pentru o cheie %s: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "Ac�iuni permise curent: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Comut� capabilitatea de semnare\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Comut� capabilitatea de cifrare\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Comut� capabilitatea de autentificare\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Terminat\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Selecta�i ce fel de cheie dori�i:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA �i Elgamal (implicit)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA �i Elgamal (implicit)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (numai semnare)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (numai semnare)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (numai cifrare)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (numai cifrare)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (seteaz� singur capabilit��ile)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (seteaz� singur capabilit��ile)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA �i Elgamal (implicit)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (numai semnare)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (seteaz� singur capabilit��ile)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (numai cifrare)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (2) Cheie de cifrare\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notare semn�tur�: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Nici o subcheie cu indicele %d\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "cheile %s pot avea lungimea �ntre %u �i %u bi�i.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Ce lungime de cheie dori�i? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Ce lungime de cheie dori�i? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Lungimea cheii necesar� este %u bi�i\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "rotunjit� prin adaos la %u bi�i\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Selecta�i ce fel de cheie dori�i:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5105,7 -4084,6 +5163,7 @@@ msgstr "
" <n>m = cheia expir� �n n luni\n"
" <n>y = cheia expir� �n n ani\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5121,38 -4099,30 +5179,38 @@@ msgstr "
" <n>m = semn�tura expir� �n n luni\n"
" <n>y = semn�tura expir� �n n ani\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Cheia este valid� pentru? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Semn�tura este valid� pentru? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "valoare invalid�\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "Cheia nu expir� deloc\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "Semn�tura nu expir� deloc\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "Cheia expir� pe %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "Semn�tura expir� pe %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5160,11 -4130,9 +5218,11 @@@ msgstr "
"Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
"Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Este aceasta corect? (d/N) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5175,7 -4143,6 +5233,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5192,50 -4159,39 +5250,50 @@@ msgstr "
" \"Popa Ioan (popic�) <popa.ioan at compania.ro>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Nume real: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Caracter invalid �n nume\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Numele nu poate �ncepe cu o cifr�\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
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:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Adres� de email: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Nu este o adres� de email valid�\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Comentariu: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Caracter invalid �n comentariu\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5246,7 -4202,6 +5304,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5261,35 -4216,28 +5319,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoTt"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5301,12 -4249,10 +5359,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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generarea cheii a e�uat: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5314,71 -4260,58 +5372,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "cheia exist� deja\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Crea�i oricum? "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Crea�i oricum? "
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Generarea cheii a fost anulat�.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, 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:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "cheile secret� �i public� au fost create �i semnate.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5388,7 -4321,6 +5446,7 @@@ msgstr "
"s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
"pentru acest scop.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5396,7 -4328,6 +5454,7 @@@ msgstr "
"cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5404,49 -4335,38 +5462,49 @@@ msgstr "
"cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
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:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Crea�i �ntr-adev�r? (d/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "niciodat� "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Politic� de semn�turi critic�: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Politic� de semn�turi: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Server de chei preferat critic: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Notare semn�tur� critic�: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Notare semn�tur�: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5454,55 -4374,51 +5512,63 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d semn�turi incorecte\n"
msgstr[1] "%d semn�turi incorecte\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
+ msgstr[1] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Inel de chei"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "s�rit� \"%s\": %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Amprent� cheie primar�:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Amprent� cheie primar�:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Amprent� subcheie:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " Amprent� cheie ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " Card nr. serie ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, 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:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5510,14 -4426,12 +5576,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
msgstr[1] "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5525,59 -4439,46 +5591,59 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 semn�tur� incorect�\n"
msgstr[1] "1 semn�tur� incorect�\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: inelul de chei creat\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "Introduce�i URL-ul serverului de chei preferat: "
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "deactivat(�)"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
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:857
++#: g10/keyserver.c:856
#, 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:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5585,470 -4486,376 +5651,470 @@@ msgid_plural "refreshing %d keys from %
msgstr[0] "reactualizez %d chei de la %s\n"
msgstr[1] "reactualizez %d chei de la %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, 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:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "cer cheia %s de la serverul %s %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "cer cheia %s de la %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "nici o ac�iune pentru serverul de chei!\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "trimit cheia %s lui %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, 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:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s cheie de sesiune cifrat�\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "cheia public� este %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "date cigrate cu cheie public�: DEK bun\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrat cu cheia %s, ID %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decriptarea cu cheie public� a e�uat: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifrat� cu %lu fraze-parol�\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "cifrat� cu 1 fraz�-parol�\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "presupunem date cifrate %s\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "cifru IDEA indisponibil, vom �ncerca s� folosim %s �n loc\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "decriptare OK\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "decriptarea a e�uat: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nume fi�ier original='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "Semn�tur� bun� din \"%s\""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Semn�tur� INCORECT� din \"%s\""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Semn�tur� expirat� din \"%s\""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "Semn�tur� bun� din \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "verificare semn�tur� eliminat�\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "nu pot m�nui aceste semn�turi multiple\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Semn�tur� f�cut� %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " folosind cheia %s %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Cheie disponibil� la: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[nesigur]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " aka \"%s\""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Semn�tur� expirat� %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Semn�tura expir� %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binar"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "modtext"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "necunoscut"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritm pubkey necunoscut"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nu pot verifica semn�tura: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "nu o semn�tur� deta�at�\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, 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:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) a e�uat �n %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "AVERTISMENT: folosesc algoritmul cu cheie public� experimental %s\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "eroare citire �n `%s': %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "eroare citire �n `%s': %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Necompresat"
#
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "necompresat|niciunul"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "op�iune ambigu� `%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "op�iune necunoscut� `%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, 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
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Fi�ierul `%s' exist�. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Suprascriu? (d/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: sufix necunoscut\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Introduce�i un nou nume-fi�ier"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "scriu la stdout\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "presupun date semnate �n `%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "fi�ier de configurare nou `%s' creat\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr ""
"AVERTISMENT: op�iunile din %s nu sunt �nc� active �n timpul acestei rul�ri\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
"(insecure)\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpachetul de tip %d are bitul critic setat\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (ID cheie principal� %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6062,15 -4869,12 +6128,15 @@@ msgstr "
"\"%.*s\"\n"
"cheia %u-bit %s, ID %s, creat� %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Introduce�i fraza-parol�\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "anulat� de utilizator\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6079,53 -4883,44 +6145,53 @@@ msgstr "
"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
"utilizator: \"%s\"\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "cheia %u-bit %s, ID %s, creat� %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (subcheie pe cheia principal� ID %s)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr ""
"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6185,31 -4972,24 +6251,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Nici un motiv specificat"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Cheia este �nlocuit�"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Cheia a fost compromis�"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Cheia nu mai este folosit�"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "ID utilizator nu mai este valid"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "motiv pentru revocare: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "comentariu revocare: "
@@@ -6223,54 -5003,43 +6289,54 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMtTsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Nici o valoare de �ncredere atribuit� lui:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " aka \"%s\"\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, 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:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = NU am �ncredere\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Am �ncredere suprem�\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = �napoi la meniul principal\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = s�ri peste cheia asta\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " t = termin�\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6279,42 -5048,34 +6345,42 @@@ msgstr "
"Nivelul minim de �ncredere pentru aceast� cheie este: %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Decizia d-voastr�? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificatele ce conduc la o cheie cu �ncredere suprem�:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "Aceast� cheie apar�ine probabil utilizatorului numit\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Aceast� cheie ne apar�ine\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6324,132 -5085,104 +6390,132 @@@ 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:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "Folosi�i oricum aceast� cheie? (d/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Not�: Aceast� cheie a expirat!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Semn�tura este probabil un FALS.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: s�rit�: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: s�rit�: cheia public� este deactivat�\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "nu m� pot conecta la `%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Destinatari curen�i:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6457,171 -5190,135 +6523,171 @@@ msgstr "
"\n"
"Introduce�i ID-ul utilizator. Termina�i cu o linie nou�: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Nu exist� acest ID utilizator.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Cheia public� este deactivat�.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "s�rit�: cheia public� setat� deja\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatar implicit necunoscut \"%s\"\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "nici un destinatar valid\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, 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:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Semn�tur� deta�at�.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "V� rug�m introduce�i numele fi�ierului de date: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "citesc stdin ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "nici o dat� semnat�\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nu pot deschide date semnate `%s'\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "destinator anonim; �ncerc cheia secret� %s ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "OK, noi suntem destinatarul anonim.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "vechea encodare a lui DEK nu este suportat�\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"AVERTISMENT: algoritm cifrare %s nu a fost g�sit �n preferin�ele "
"destinatarului\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "NOT�: cheia secret� %s a expirat la %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet a e�uat: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "cheia %s nu are nici un ID utilizator\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Pentru a fi revocat de:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "Cheia secret� este disponibil�.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "Ie�ire �n armur� ASCII for�at�.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet a e�uat: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Certificat de revocare creat.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6630,20 -5327,17 +6696,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Certificat de revocare creat.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6652,22 -5346,18 +6718,22 @@@ msgstr "cheia secret� \"%s\" nu a fost
#. 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:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
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:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6685,79 -5375,63 +6751,79 @@@ 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:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Renun��"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Motiv pentru revocare: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Nici o descriere dat�)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Este aceasta OK? (d/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "cheie slab� creat� - re�ncerc\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "nu pot evita cheie slab� pentru cifru simetric; am �ncercat %d ori!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = arat�-mi mai multe informa�ii\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6765,7 -5439,6 +6831,7 @@@ msgid_plural "public key %s is %lu seco
msgstr[0] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
msgstr[1] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6773,7 -5446,6 +6839,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
msgstr[1] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6788,7 -5460,6 +6854,7 @@@ msgstr[1] "
"cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6802,41 -5473,34 +6868,41 @@@ msgstr[1] "
"cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "NOT�: cheia a fost revocat�"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"AVERTISMENT: nu pot %%-expanda notarea (prea mare). Folosesc neexpandat.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6844,7 -5508,6 +6910,7 @@@ msgstr "
"AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare). �l folosesc "
"neexpandat.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6853,12 -5516,10 +6919,12 @@@ msgstr "
"AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare). �l "
"folosesc neexpandat.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s semn�tur� de la: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6866,40 -5527,32 +6932,40 @@@ msgstr "
"AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
"destinatarului\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "semnare:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "va fi folosit� cifrarea %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "s�rit� \"%s\": duplicat�\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "s�rit�: cheia secret� deja prezent�\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6908,344 -5561,278 +6974,344 @@@ msgstr "
"# List� cu valori de �ncredere atribuite, creat� %s\n"
"# (Folosi�i \"gpg --import-ownertrust\" pentru a le reface)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error in '%s': %s\n"
msgstr "eroare �n `%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "linie prea lung�"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "caracter : lips�"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "amprent� invalid�"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "lipse�te valorea �ncrederii �n proprietari (ownertrust)"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
#| msgid "error finding trust record in `%s': %s\n"
msgid "error finding trust record in '%s': %s\n"
msgstr "eroare g�sire �nregistrare �ncredere �n `%s': %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "read error in '%s': %s\n"
msgstr "eroare citire �n `%s': %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sincronizarea a e�uat: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
#| msgid "can't create lock for `%s'\n"
msgid "can't create lock for '%s'\n"
msgstr "nu pot crea �ncuietoare (lock) pentru `%s'\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
#| msgid "can't lock `%s'\n"
msgid "can't lock '%s'\n"
msgstr "nu pot �ncuia (lock) `%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb rec %lu: scrierea a e�uat (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "tranzac�ia trustdb prea mare\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:675
+ #, c-format
+ msgid "%s: directory does not exist!\n"
+ msgstr "%s: directorul nu exist�!\n"
+
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
msgstr "nu pot accesa `%s': %s\n"
- #: g10/tdbio.c:688
- #, c-format
- msgid "%s: directory does not exist!\n"
- msgstr "%s: directorul nu exist�!\n"
-
- #: g10/tdbio.c:711
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: am e�uat s� creez �nregistrare versiune: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: a fost creat trustdb invalid\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: a fost creat trustdb\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "NOT�: nu poate fi scris �n trustdb\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb invalid\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: am e�uat s� creez hashtable: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: eroare actualizare �nregistrare versiune: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: eroare citire �nregistrare versiune: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek a e�uat: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: nu e un fi�ier trustdb\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: �nregistrare versiune cu recnum %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versiune fi�ier invalid� %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: eroare citire �nregistrare liber�: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: eroare scriere �nregistrare dir: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: eroare setere la zero a �nregistr�rii: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: ad�ugarea unei �nregistr�ri a e�uat: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: a fost creat trustdb\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "nu pot m�nui linii de text mai lungi de %d caractere\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "linii de intrare mai lungi de %d caractere\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Algoritmuri suportate:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: eroare scriere �nregistrare dir: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "eroare �n `%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "cheia public� %s nu a fost g�sit�: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Politica: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "enumer� chei"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [fi�iere]|afi�eaz� rezumate mesaje"
msgstr[1] "|algo [fi�iere]|afi�eaz� rezumate mesaje"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7255,174 -5842,154 +7321,185 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "cheia %s: acceptat� ca cheie de �ncredere\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "cheia %s marcat� ca av�nd �ncredere suprem�\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, 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:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "folosesc model de �ncredere %s\n"
@@@ -7431,7 -5997,6 +7508,7 @@@
msgid "no need for a trustdb check\n"
msgstr "nu e nevoie de o verificare trustdb\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "urm�toarea verificare trustdb programat� pe %s\n"
@@@ -7481,36 -6038,29 +7558,36 @@@ msgstr "nu am g�sit nici o cheie cu �nc
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:2051
++#: g10/trustdb.c:2054
#, 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:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
"nu pot actualiza �nregistrare versiunii trustdb: scrierea a e�uat: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "nedefinit�"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "niciodat�"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "marginal"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "deplin�"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "suprem�"
@@@ -7522,41 -6072,32 +7599,41 @@@
#. 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
++#: g10/trust.c:146
#, fuzzy
#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "10 traduc�tor vezi trustdb.c:uid_trust_string_fixed"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[revocat�]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[expirat�] "
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[necunoscut�]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[ nedef ]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[marginal]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ deplin�]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ suprem�]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7566,12 -6107,10 +7643,12 @@@ msgstr "
"V� rug�m aminti�i-v� c� fi�ierul de semn�tur� (.sig sau .asc)\n"
"ar trebui s� fie primul dat �n linia de comand�.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "nu pot deschide `%s': %s\n"
@@@ -7903,7 -6374,6 +7980,7 @@@ msgstr "|N|PIN Nou
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8048,9 -6488,6 +8125,9 @@@ msgstr "eroare la ob�inerea num�rului s
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "citirea cheii publice a e�uat: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "am e�uat s� stochez cheia: %s\n"
@@@ -8563,7 -6895,6 +8640,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "eroare la citire keyblock: %s\n"
@@@ -8588,135 -6915,105 +8665,135 @@@ msgstr "stergere keyblock a e�uat: %s\n
msgid "no valid recipients given\n"
msgstr "(Nici o descriere dat�)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "enumer� chei secrete"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "certificat incorect"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "certificat incorect"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "certificat incorect"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
#, fuzzy
msgid "register a smartcard"
msgstr "adaug� o cheie la un smartcard"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "creaz� ie�ire �n armur� ascii"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "nu folosi deloc terminalul"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "modul batch: nu �ntreba niciodat�"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "presupune da la cele mai multe �ntreb�ri"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "presupune nu la cele mai multe �ntreb�ri"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "adaug� acest inel de chei la lista inelelor de chei"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NUME|folose�te algoritm cifrare NUME"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8727,48 -7024,39 +8804,48 @@@ msgstr "
"sign, check, encrypt sau decrypt\n"
"opera�iunea implicit� depinde de datele de intrare\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "nu m� pot conecta la `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "op�iune necunoscut� `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Nici o descriere dat�)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = s�ri peste cheia asta\n"
#
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nu pot accesa `%s': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8786,7 -7071,6 +8863,7 @@@ msgstr "genereaz� un certificat de revo
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
@@@ -8801,32 -7083,26 +8878,32 @@@ msgstr "eroare la ob�inerea num�rului s
msgid "error reading input: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "am e�uat s� stochez amprenta: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? probleme la verificare revoc�rii: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "eroare la citire `%s': %s\n"
@@@ -9003,7 -7246,6 +9080,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "Certificat de revocare creat.\n"
@@@ -9013,8 -7254,6 +9090,8 @@@
msgid "certificate cached\n"
msgstr "preferin�a `%s' duplicat�\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
@@@ -9632,13 -7748,11 +9709,13 @@@ msgstr "certificat incorect
msgid "force the use of the default OCSP responder"
msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9646,86 -7760,70 +9723,86 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, 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:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "preferin�a `%s' duplicat�\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "NOT�: cheia a fost revocat�"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Algoritmuri suportate:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9882,13 -7946,11 +9959,13 @@@ msgstr "folosire: gpg [op�iuni]
msgid "colons are not allowed in the socket name\n"
msgstr "%s nu este permis cu %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, 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:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
@@@ -10397,78 -8357,62 +10474,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, 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:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/ru.po
index 5909ef5,f311cd1..c34a61b
--- a/po/ru.po
+++ b/po/ru.po
@@@ -11,8 -11,7 +11,8 @@@ msgid "
msgstr ""
"Project-Id-Version: GnuPG 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
- "PO-Revision-Date: 2015-08-12 17:17+0000\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
+ "PO-Revision-Date: 2016-01-27 17:17+0000\n"
"Last-Translator: Ineiev <ineiev at gnu.org>\n"
"Language-Team: Russian <gnupg-ru at gnupg.org>\n"
"Language: ru\n"
@@@ -104,8 -88,6 +104,8 @@@ msgstr "
msgid "PIN:"
msgstr "PIN:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Фраза-пароль:"
@@@ -155,24 -126,10 +155,24 @@@ msgstr "Неверная фраза-п�
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ключи ssh длиннее %d бит не поддерживаются\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, c-format
msgid "can't create '%s': %s\n"
msgstr "не могу создать '%s': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1668
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не могу открыть '%s': %s\n"
@@@ -247,11 -191,9 +247,11 @@@ msgstr "
msgid "failed to create stream from socket: %s\n"
msgstr "сбой создания потока из сокета: %s\n"
- #: agent/divert-scd.c:92 g10/call-agent.c:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr "Вставьте карту с серийным номером"
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr "Удалите текущую карту и вставьте карту с серийным номером"
@@@ -383,8 -301,6 +383,8 @@@ msgstr "Введите фразу-па�
msgid "Please enter the new passphrase"
msgstr "Введите новую фразу-пароль"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -392,128 -308,92 +392,130 @@@ msgstr "
"@Параметры:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "запуск в режиме демона (фоновый режим)"
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "запуск в режиме сервера (нефоновый режим)"
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "подробно"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "сократить подробности"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "вывод команд в стиле sh"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "вывод команд в стиле csh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|FILE|взять параметры из файла FILE"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "не отсоединяться от консоли"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "не захватывать клавиатуру и мышь"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "использовать файл журнала для сервера"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|использовать программу PGM для ввода паролей"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|использовать программу PGM как демон криптографических карт"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "не использовать демон криптографических карт"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|принимать некоторые команды по NAME"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "игнорировать запросы смены терминала"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "игнорировать запросы смены дисплея XWindow"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|сбрасывать запомненный PIN через N секунд"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "не использовать запомненный PIN при подписывании"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
msgid "disallow the use of an external password cache"
msgstr "не позволять пользоваться внешней памятью паролей"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr "не позволять клиентам помечать ключи как \"доверенные\""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "разрешить предустанавливать фразу-пароль"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ #, fuzzy
+ #| msgid "allow caller to override the pinentry"
+ msgid "disallow caller to override the pinentry"
msgstr "разрешить клиентам замещать собой pinentry"
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr "разрешить ввод фразы-пароля через Emacs"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
msgid "enable ssh support"
msgstr "включить поддержку ssh"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr "включить поддержку putty"
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Вызов: @GPG_AGENT@ [параметры] (-h для подсказки)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -521,137 -401,105 +523,143 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
"Управление секретными ключами для @GNUPG@\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "запрошен недопустимый уровень отладки '%s'\n"
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: dirmngr/dirmngr.c:895
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
- #: agent/gpg-agent.c:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "чтение параметров из '%s'\n"
- #: agent/gpg-agent.c:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "не могу создать сокет: %s\n"
- #: agent/gpg-agent.c:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
- #: agent/gpg-agent.c:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "ошибка получения разового кода для сокета\n"
- #: agent/gpg-agent.c:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "сбой listen(): %s\n"
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "слушаем сокет '%s'\n"
- #: agent/gpg-agent.c:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "не могу создать каталог '%s': %s\n"
- #: agent/gpg-agent.c:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "создан каталог '%s'\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Внимание: небезопасные права доступа %s \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "сбой stat() для '%s': %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "невозможно использовать '%s' как домашний каталог\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "обработчик 0x%lx для файлового дескриптора %d запущен\n"
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "обработчик 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d запущен\n"
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s остановлен\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "в этом сеансе агент gpg не работает\n"
@@@ -668,8 -514,6 +676,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
"Работа с буфером паролей\n"
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -677,9 -521,6 +685,9 @@@ msgstr "
"@Команды:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -689,11 -530,9 +697,11 @@@ msgstr "
"Параметры:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Вызов: gpg-protect-tool [параметры] (-h для подсказки)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -701,22 -540,18 +709,22 @@@ msgstr "
"Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
"Средство работы с секретными ключами\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Введите фразу-пароль для снятия защиты с объекта PKCS#12."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Введите фразу-пароль для защиты нового объекта PKCS#12."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Введите фразу-пароль для защиты импортированных объектов в системе GnuPG."
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -724,11 -559,9 +732,11 @@@ msgstr "
"Введите фразу-пароль или PIN,\n"
"необходимые для выполнения данной операции."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "отменено\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "ошибка запроса ввода фразы-пароля: %s\n"
@@@ -793,8 -616,6 +801,8 @@@ msgstr "
msgid "Yes"
msgstr "Да"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "Нет"
@@@ -825,13 -643,11 +833,13 @@@ msgstr "Подтверждаю
msgid "Wrong"
msgstr "Неверно"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Замечание: Фразу-пароль никогда не меняли.%0AПожалуйста, смените ее сейчас."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@@ -839,26 -655,21 +847,26 @@@
msgstr ""
"Фраза-пароль не менялась%%0Aс %.4s-%.2s-%.2s. Пожалуйста, смените ее сейчас."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "Сменить фразу-пароль"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "Сменю позже"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Вы действительно хотите удалить ключ с кодом%%0A %s%%0A %%C%%0A?"
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
msgid "Delete key"
msgstr "Удалить ключ"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -866,7 -677,6 +874,7 @@@ msgstr "
"Внимание: этот ключ также в списке для применения с SSH!\n"
"Удаление его может лишить Вас возможности доступа к удаленным машинам."
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA требует длины хэша, кратной 8 битам\n"
@@@ -904,53 -707,43 +912,58 @@@ msgstr "алгоритм защиты %
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "хэш-функция защиты %d (%s) не поддерживается\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "ошибка при создании канала конвейера: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, c-format
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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "ошибка при дублировании процесса: %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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "сбой при ожидании завершения процесса %d: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "ошибка выполнения '%s': возможно, не установлен\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "ошибка выполнения '%s': статус завершения %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, c-format
msgid "error running '%s': terminated\n"
msgstr "ошибка выполнения '%s': прервано\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "ошибка получения кода возврата процесса %d: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "сбой при ожидании завершения процесса %d: %s\n"
+
+#: common/simple-pwquery.c:376
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "не могу подключиться к '%s': %s\n"
@@@ -963,15 -754,17 +976,21 @@@ msgstr "проблема связи с
msgid "problem setting the gpg-agent options\n"
msgstr "проблема задания параметров агента gpg\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "прервано пользователем\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "проблема с агентом\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "проблема с агентом: %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "не могу отключить создание файла образа памяти: %s\n"
@@@ -1041,17 -820,18 +1060,22 @@@ msgstr "выход за предел б
msgid "out of core while allocating %lu bytes"
msgstr "выход за границы при размещении %lu байтов"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "ошибка выделения достаточной памяти: %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: устаревший параметр \"%s\" - игнорируется\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "Внимание: параметр \"%s%s\" устарел - он игнорируется\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "неизвестный отладочный флаг '%s' игнорируется\n"
@@@ -1342,7 -1055,6 +1366,7 @@@ msgstr "параметр \"%.50s\" не
msgid "command \"%.50s\" is ambiguous\n"
msgstr "команда \"%.50s\" неоднозначна\n"
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "нехватка выделенной памяти\n"
@@@ -1351,22 -1062,14 +1375,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "недопустимый параметр \"%.50s\"\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "Вы нашли ошибку в программе ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "преобразование из '%s' в '%s' недоступно\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "сбой в iconv_open: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "сбой преобразования '%s' в '%s': %s\n"
@@@ -1405,86 -1101,72 +1424,92 @@@ msgstr "блокировка '%s' не
msgid "waiting for lock %s...\n"
msgstr "ожидаю снятия блокировки %s...\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "текстовый формат: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "недопустимый текстовый заголовок: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "текстовый заголовок: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "недопустимый заголовок текстовой подписи\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "неизвестный текстовый заголовок: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "вложенные текстовые подписи\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "неожиданный текстовый формат: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "недопустимая строка, выделенная дефисами: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "недопустимый символ radix64 %02X (игнорируется)\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "преждевременный конец файла (нет контрольной суммы)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "преждевременный конец файла (в контрольной сумме)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "поврежденная контрольная сумма\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "ошибка контрольной суммы; %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "преждевременный конец файла (в дополнении)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "ошибка в строке дополнения\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "не найдено данных формата OpenPGP.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "недопустимый текстовый формат: строка длиннее %d символов\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"символ quoted printable в текстовом формате - испорчено почтовой "
"программой?\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "не для чтения человеком"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1492,81 -1174,70 +1517,92 @@@ msgstr "
"имя примечания должно содержать только печатные символы или пробелы и "
"заканчиваться знаком '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "имя примечания пользователя должно содержать символ '@'\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr ""
"имя примечания пользователя не должно содержать более одного символа '@'\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "в значении примечания не должно быть управляющих символов\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr ""
+ "имя примечания пользователя не должно содержать более одного символа '@'\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "имя примечания должно содержать только печатные символы или пробелы и "
+ "заканчиваться знаком '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "Внимание: найдена недопустимая форма записи примечания\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "не для чтения человеком"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "сбой при трансляции запроса %s клиенту\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Введите фразу-пароль:"
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
- #, fuzzy, c-format
- #| msgid "error creating keyring '%s': %s\n"
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
+ #, c-format
msgid "error getting version from '%s': %s\n"
- msgstr "ошибка создания таблицы ключей '%s': %s\n"
+ msgstr "ошибка получения версии из '%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
- msgstr ""
+ msgstr "сервер '%s' старше нас (%s < %s)"
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
- #, fuzzy, c-format
- #| msgid "WARNING: %s overrides %s\n"
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
+ #, c-format
msgid "WARNING: %s\n"
- msgstr "Внимание: %s отменяет %s\n"
+ msgstr "Внимание: %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Карта OpenPGP недоступна: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Обнаружена карта OpenPGP номер %s\n"
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "в пакетном режиме это действие невозможно\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "Эта команда доступна только для карт версии 2.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
msgid "Reset Code not or not anymore available\n"
msgstr "Код сброса (больше) не доступен\n"
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ваш выбор? "
@@@ -1628,20 -1285,10 +1664,15 @@@ msgstr "URL для получения �
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Ошибка: Слишком длинный URL (предел - %d символов).\n"
- #: g10/card-util.c:799 tools/no-libgcrypt.c:30
- #, c-format
- msgid "error allocating enough memory: %s\n"
- msgstr "ошибка выделения достаточной памяти: %s\n"
-
- #: g10/card-util.c:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "ошибка записи '%s': %s\n"
@@@ -1736,13 -1364,10 +1767,13 @@@ msgstr "Какой Вам нужен р
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Какой Вам нужен размер ключа для аутентификации? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлен до %u бит\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "размер ключей %s должен быть в пределах %u-%u\n"
@@@ -1796,9 -1411,6 +1827,9 @@@ msgstr " (2) Ключ шифрова�
msgid " (3) Authentication key\n"
msgstr " (3) Ключ аутентификации\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Неправильный выбор.\n"
@@@ -1827,7 -1433,6 +1858,7 @@@ msgstr "Продолжить? (y/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Подтвердите сброс к заводским установкам (введите \"yes\") "
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "выйти из этого меню"
@@@ -1835,7 -1439,6 +1866,7 @@@
msgid "show admin commands"
msgstr "показать административные команды"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "показать данную справку"
@@@ -1911,116 -1496,87 +1942,116 @@@ msgstr "Команды админист
msgid "Admin commands are not allowed\n"
msgstr "Команды администрирования не разрешены\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Недопустимая команда (список команд: \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output для данной команды не работает\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "не могу открыть '%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ \"%s\" не найден: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "ошибка чтения блока ключей: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, c-format
msgid "key \"%s\" not found\n"
msgstr "ключ \"%s\" не найден\n"
- #: g10/delkey.c:130 g10/delkey.c:137
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(если только Вы не задали ключ отпечатком)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "не могу выполнить в пакетном режиме без \"--yes\"\n"
- #: g10/delkey.c:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "Удалить данный ключ из таблицы? (y/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Это секретный ключ! - все равно удалить? (y/N) "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "сбой при удалении секретного %s: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "ключа"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "subkey"
msgstr "подключа"
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "сбой при удалении блока ключа: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "сведения о доверии владельцу сброшены\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "имеется секретный ключ для открытого ключа \"%s\"!\n"
- #: g10/delkey.c:272
++#: g10/delkey.c:271
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "сначала удалите его командой \"--delete-secret-keys\".\n"
- #: g10/encrypt.c:226 g10/sign.c:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "ошибка при создании фразы-пароля: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "не могу использовать симметричный пакет ESK из-за режима S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "используется симметричный шифр %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, c-format
msgid "'%s' already compressed\n"
msgstr "'%s' уже сжат\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "Внимание: файл '%s' пуст\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, c-format
msgid "reading from '%s'\n"
msgstr "чтение из '%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2028,47 -1584,39 +2059,47 @@@ msgstr "
"Внимание: принудительное использование симметричного шифра %s (%d)\n"
" нарушает предпочтения получателя\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "Внимание: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"принудительное использование симметричного шифра %s (%d) нарушает "
"предпочтения получателя\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "нельзя использовать %s в режиме %s\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "нельзя использовать %s в режиме %s\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "данные зашифрованы алгоритмом %s\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "зашифровано неизвестным алгоритмом %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"Внимание: сообщение было зашифровано слабым ключом симметричного шифра.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "проблема обработки зашифрованного пакета\n"
@@@ -2126,135 -1663,101 +2157,129 @@@ msgstr "Внимание: не мог�
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "Внимание: не могу удалить временный каталог '%s': %s\n"
- #: g10/export.c:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "экспортировать подписи, помеченные как 'только локальные'"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr "экспортировать атрибутные ID пользователя (обычно фотоидентификаторы)"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "экспортировать ключи отзыва, помеченные как 'особо важные'"
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "удалить при экспорте непригодные части ключа"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr "при экспорте удалить из ключа как можно больше"
- #: g10/export.c:896
++#: g10/export.c:895
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "экспорт секретных ключей не разрешен\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: ключ типа PGP 2.x - пропущен\n"
- #: g10/export.c:1241
++#: g10/export.c:1240
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "ключ %s: материал ключа на карте - пропущен\n"
- #: g10/export.c:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "Внимание: нечего экспортировать\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "ошибка создания '%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[ID пользователя не найден]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(проверьте аргумент параметра '%s')\n"
- #: g10/getkey.c:504
- #, fuzzy, c-format
- #| msgid ""
- #| "Warning: value '%s' for option '%s' should be a long key ID or a "
- #| "fingerprint\n"
++#: g10/getkey.c:503
+ #, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- "Внимание: значение '%s' параметра '%s' должно быть длинным идентификатором "
- "или отпечатком ключа\n"
+ "Внимание: '%s' должно быть должно быть длинным идентификатором или "
+ "отпечатком ключа\n"
- #: g10/getkey.c:534
- #, fuzzy, c-format
- #| msgid "error closing %s: %s\n"
++#: g10/getkey.c:533
+ #, c-format
msgid "error looking up: %s\n"
- msgstr "ошибка закрытия %s: %s\n"
+ msgstr "ошибка поиска: %s\n"
- #: g10/getkey.c:624
- #, fuzzy, c-format
- #| msgid "error searching the keyring: %s\n"
++#: g10/getkey.c:623
+ #, c-format
msgid "Warning: %s appears in the keyring %d times\n"
- msgstr "ошибка поиска в таблице ключей %s\n"
+ msgstr "Внимание: %s включено в таблицу ключей %d раз\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "автоматически получили '%s' через %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "ошибка получения '%s' через %s: %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "Нет отпечатка"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "секретный ключ \"%s\" не найден: %s\n"
- #: g10/getkey.c:1674
- #, fuzzy, c-format
- #| msgid "using \"%s\" as default secret key\n"
++#: g10/getkey.c:1678
+ #, c-format
msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "\"%s\" используется в качестве основного секретного ключа\n"
+ msgstr "Внимание: '%s' не используется в качестве основного ключа: %s\n"
- #: g10/getkey.c:1682
- #, fuzzy, c-format
- #| msgid "using \"%s\" as default secret key\n"
++#: g10/getkey.c:1686
+ #, c-format
msgid "using \"%s\" as default secret key for signing\n"
- msgstr "\"%s\" используется в качестве основного секретного ключа\n"
+ msgstr ""
+ "\"%s\" используется в качестве основного секретного ключа для подписи\n"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
- msgstr ""
+ msgstr "все значения, переданные в '%s', игнорируются\n"
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Параметр --allow-non-selfsigned-uid сделал недостоверный ключ %s "
"достоверным\n"
- #: g10/getkey.c:3296
++#: g10/getkey.c:3301
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "использую подключ %s вместо первичного ключа %s\n"
- #: g10/gpg.c:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "создать подпись"
@@@ -2262,11 -1764,9 +2287,11 @@@
msgid "make a clear text signature"
msgstr "создать текстовую подпись"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "создать отделенную подпись"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "зашифровать данные"
@@@ -2274,15 -1773,12 +2299,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "шифрование только симметричным шифром"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "расшифровать данные (по умолчанию)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "проверить подпись"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "вывести список ключей"
@@@ -2294,15 -1788,12 +2319,15 @@@ msgstr "вывести список к�
msgid "list and check key signatures"
msgstr "вывести и проверить подписи ключей"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "вывести список ключей и их отпечатков"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "вывести список секретных ключей"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "создать новую пару ключей"
@@@ -2322,7 -1809,6 +2347,7 @@@ msgstr "создание полноце
msgid "generate a revocation certificate"
msgstr "создать сертификат отзыва"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "удалить ключи из таблицы открытых ключей"
@@@ -2350,7 -1830,6 +2375,7 @@@ msgstr "подписать ключ л�
msgid "sign or edit a key"
msgstr "подписать или редактировать ключ"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "сменить фразу-пароль"
@@@ -2398,25 -1866,22 +2423,27 @@@ msgstr "обновить таблиц�
msgid "print message digests"
msgstr "вывести хэши сообщений"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "запуск в режиме сервера"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ #, fuzzy
+ #| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
"|VALUE|установить правила TOFU для ключа (good - хороший, unknown - "
"неизвестно, bad - плохой, ask - спрашивать, auto - автоматически)"
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "вывод в текстовом формате"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифровать для пользователя USER-ID"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|использовать ключ USER-ID для подписи и расшифровки"
@@@ -2428,11 -1891,9 +2455,11 @@@ msgstr "|N|установить уро�
msgid "use canonical text mode"
msgstr "использовать канонический текстовый режим"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|выводить данные в файл FILE"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "не делать никаких изменений"
@@@ -2444,7 -1903,6 +2471,7 @@@ msgstr "спросить перед п�
msgid "use strict OpenPGP behavior"
msgstr "строго следовать стандарту OpenPGP"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2452,7 -1910,6 +2479,7 @@@ msgstr "
"@\n"
"(Полный список команд и параметров см. на странице man)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2472,11 -1929,9 +2499,11 @@@ msgstr "
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Вызов: @GPG@ [параметры] [файлы] (-h для подсказки)"
- #: g10/gpg.c:988
++#: g10/gpg.c:991
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2486,7 -1941,6 +2513,7 @@@ msgstr "
"Подписи и их проверка, шифрование и расшифровка\n"
"Действие по умолчанию зависит от входных данных\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2494,94 -1948,76 +2521,94 @@@ msgstr "
"\n"
"Поддерживаются следующие алгоритмы:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "С открытым ключом: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Симметричные шифры: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Хэш-функции: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Алгоритмы сжатия: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "вызов: %s [параметры] %s\n"
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "несовместимые команды\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "в определении группы '%s' отсутствует знак =\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Внимание: небезопасный владелец домашнего каталога '%s'\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Внимание: небезопасный владелец файла настроек '%s'\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Внимание: небезопасный владелец файла модуля расширения '%s'\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Внимание: небезопасные права доступа к домашнему каталогу '%s'\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу настроек '%s'\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу модуля расширения '%s'\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего домашний каталог '%s'\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1537
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего файл настроек '%s'\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога,\n"
" содержащего модуль расширения '%s'\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1546
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему домашний каталог '%s'\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1549
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2589,494 -2025,382 +2616,493 @@@ msgstr "
"ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
" содержащему файл настроек '%s'\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему файл модуля расширения '%s'\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1759
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "неизвестный элемент в файле настроек '%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "показать в списке ключей фотоидентификаторы"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
msgid "show key usage information during key listings"
msgstr "показать в списке ключей сведения о назначении ключа"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "показать в списке подписей URL правил"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "показать в списке подписей все примечания"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "показать в списке подписей примечания стандарта IETF"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "показать в списке подписей пользовательские примечания"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr "показать в списке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "показать в списке ключей действительность ID пользователей"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr "показать в списке ключей отозванные и просроченные ID пользователей"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr "показать в списке ключей отозванные и просроченные подключи"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "показать в списке ключей название таблицы ключей"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "показать в списке подписей сроки действия"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
msgid "available TOFU policies:\n"
msgstr "Доступные правила TOFU:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "неизвестные правила TOFU '%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr "(\"help\" выведет список вариантов)\n"
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "неизвестный формат базы данных TOFU '%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
- #: g10/gpg.c:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "слишком старая версия libcrypt (нужно %s, есть %s)\n"
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Замечание: %s не предназначен для нормального применения!\n"
- #: g10/gpg.c:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' - не допустимый срок действия подписи\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "недопустимый режим ввода PIN '%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' - не допустимая таблица символов\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "не могу интерпретировать URL сервера ключей\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "недопустимые параметры импорта\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "недопустимые параметры экспорта\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недопустимые параметры списка\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "недопустимые параметры списка\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "показать при проверке подписи фотоидентификаторы"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "показать при проверке подписи URL правил"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "показать при проверке подписей все примечания"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "показать при проверке подписей примечания стандарта IETF"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "показать при проверке подписей пользовательские примечания"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "показать при проверке подписей действительность ID пользователей"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показать при проверке подписей отозванные и просроченные ID пользователя"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
msgid "show only the primary user ID in signature verification"
msgstr "показать при проверке подписей только первичный ID пользователя"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "проверить подписи по данным PKA"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr "поднять доверие подписей по действительным данным PKA"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недопустимые параметры проверки\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "недопустимые параметры проверки\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не могу определить путь запуска для %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "Внимание: возможно создание файла образа памяти!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Внимание: %s отменяет %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s с %s недопустимо!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s с %s не имеет смысла!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "Внимание: работаем с фальшивым системным временем: "
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не будет работать с небезопасной памятью из-за %s\n"
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм шифрования\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана недопустимая хэш-функция\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм сжатия\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "выбрана недопустимая хэш-функция для сертификации\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
- #: g10/gpg.c:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3527
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3531
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "недопустимые предпочтения по умолчанию\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "недопустимые личные предпочтения шифра\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "недопустимые личные предпочтения хэш-функции\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s пока не работает совместно с %s!\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "шифрование '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3638
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "хэш-функцию '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3636
++#: g10/gpg.c:3643
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "сжатие '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "сбой инициализации таблицы доверия: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
"ключом\n"
- #: g10/gpg.c:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [файл]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [файл]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "сбой симметричного шифрования '%s': %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [файл]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [файл]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
- #: g10/gpg.c:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [файл]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [файл]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [файл]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [файл]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [файл]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [файл]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key <ID пользователя>"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key <ID пользователя>"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key <ID пользователя> [команды]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd <ID пользователя>"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "сбой при отправке на сервер ключей: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "сбой при получении с сервера ключей: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "сбой при экспорте ключа: %s\n"
- #: g10/gpg.c:4198
- #, fuzzy, c-format
- #| msgid "key export failed: %s\n"
++#: g10/gpg.c:4205
+ #, c-format
msgid "export as ssh key failed: %s\n"
- msgstr "сбой при экспорте ключа: %s\n"
+ msgstr "сбой при экспорте в виде ключа ssh: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "сбой при поиске на сервере ключей: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "сбой при обновлении с сервера ключей: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка преобразования из текстового формата: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка преобразования в текстовый формат: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "недопустимая хэш-функция '%s'\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "ошибка синтаксического анализа спецификации ключа '%s': %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "'%s' не является идентификатором, отпечатком или кодом ключа\n"
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[файл]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Пишите сообщение ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "заданный URL правил сертификации неверен\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "заданный URL правил подписи неверен\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "заданный URL предпочтительного сервера ключей неверен\n"
@@@ -3088,7 -2410,6 +3114,7 @@@ msgstr "|FILE|взять ключи и�
msgid "make timestamp conflicts only a warning"
msgstr "при несоответствии метки времени - только предупреждение"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|выводить информацию в файл с дескриптором FD"
@@@ -3113,125 -2430,99 +3139,125 @@@ msgstr "Справки нет
msgid "No help available for '%s'"
msgstr "Нет справки для '%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "импортировать подписи, обозначенные как 'только локальные'"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "устранить при импорте повреждения от сервера ключей pks"
- #: g10/import.c:111
++#: g10/import.c:110
msgid "do not clear the ownertrust values during import"
msgstr "не сбрасывать уровни доверия владельцам после импорта"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "не обновлять таблицу доверия после импорта"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "обновлять только существующие ключи"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "удалить после импорта непригодные части ключа"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "удалить после импорта из ключа как можно больше"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "пропущен блок типа %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "обработано %lu ключей\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Всего обработано: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " пропущено ключей PGP-2: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " пропущено новых ключей: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " без ID пользователя: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " импортировано: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " неизмененных: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " новых ID пользователя: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " новых подключей: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " новых подписей: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " новых отзывов ключей: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " прочитано секретных ключей: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "импортировано секретных ключей: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " неизмененных секретных ключей: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " не импортировано: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " очищено подписей: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " очищено ID пользователей: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3240,195 -2531,155 +3266,195 @@@ msgstr "
"Внимание: ключ %s содержит предпочтения для недоступных\n"
"алгоритмов для следующих ID пользователей:\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": предпочитает шифр %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": предпочитает хэш-функцию %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": предпочитает алгоритм сжатия %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "крайне желательно, чтобы Вы обновили свои предпочтения и\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"распространили этот ключ во избежание возможных нестыковок алгоритмов\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"свои предпочтения можно обновить командой gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: нет ID пользователя\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, c-format
msgid "key %s: %s\n"
msgstr "ключ %s: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr "исключен фильтром импорта"
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "ключ %s: повреждение подключа PKS исправлено\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "ключ %s: принят без самозаверенного ID пользователя \"%s\"\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "ключ %s: нет действительных ID пользователя\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "может быть, из-за отсутствия самоподписи\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не найден открытый ключ: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новый ключ - пропущен\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "нет доступной для записи таблицы ключей: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "сохраняю в '%s'\n"
- #: g10/import.c:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "ошибка записи таблицы ключей '%s': %s\n"
- #: g10/import.c:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: импортирован открытый ключ \"%s\"\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не совпадает с нашей копией\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
- #: g10/import.c:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
- #: g10/import.c:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: \"%s\" 1 новый ID пользователя\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: \"%s\" %d новых ID пользователя\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: \"%s\" 1 новая подпись\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: \"%s\" %d новых подписей\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: \"%s\" 1 новый подключ\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: \"%s\" %d новых подключей\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: \"%s\" %d подпись очищена\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: \"%s\" %d подписей очищено\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: \"%s\" %d ID пользователя очищен\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: \"%s\" %d ID пользователя очищено\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: \"%s\" не изменен\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "ключ %s: импортирован секретный ключ\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "ключ %s: секретный ключ уже имеется\n"
- #: g10/import.c:1579
++#: g10/import.c:1578
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "ключ %s: ошибка отправки в агент: %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, c-format
msgid "secret key %s: %s\n"
msgstr "секретный ключ %s: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "импорт секретного ключа не допускается\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
@@@ -3443,223 -2694,208 +3469,254 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "Для переноса '%s' выполните на каждой криптографической карте: %s\n"
- #: g10/import.c:1849
++#: g10/import.c:1848
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
- #: g10/import.c:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: недействительный сертификат отзыва: %s - отвергнут\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: сертификат отзыва \"%s\" импортирован\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: нет ID пользователя для подписи\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: алгоритм с открытым ключом у ID пользователя \"%s\" не "
"поддерживается\n"
- #: g10/import.c:2026
++#: g10/import.c:2025
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %s: неправильная самоподпись на ID пользователя \"%s\"\n"
- #: g10/import.c:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ключ %s: недействительная прямая подпись ключа\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: нет подключа для связывания ключей\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: недопустимая связь подключей\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: удалено многократное связывание подключей\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: нет подключа для отзыва ключа\n"
- #: g10/import.c:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: неверный отзыв подключа\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: удален многократный отзыв подключей\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущен ID пользователя \"%s\"\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущен подключ\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: неэкспортируемая подпись (класс 0x%02X) - пропущена\n"
- #: g10/import.c:2245
++#: g10/import.c:2244
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
- #: g10/import.c:2263
++#: g10/import.c:2262
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: недействительный сертификат отзыва: %s - пропущен\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
- #: g10/import.c:2285
++#: g10/import.c:2284
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неожиданный класс подписи (0x%02X) - пропущена\n"
- #: g10/import.c:2414
++#: g10/import.c:2413
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: обнаружено дублирование ID пользователя - объединены\n"
- #: g10/import.c:2478
++#: g10/import.c:2477
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
- #: g10/import.c:2494
++#: g10/import.c:2493
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "Внимание: ключ %s, возможно, отозван: ключ отзыва %s отсутствует.\n"
- #: g10/import.c:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: добавлен сертификат отзыва \"%s\"\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: добавлена прямая подпись ключа\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "ошибка создания щита с ключами '%s': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, c-format
msgid "error creating keyring '%s': %s\n"
msgstr "ошибка создания таблицы ключей '%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, c-format
msgid "keybox '%s' created\n"
msgstr "создан щит с ключами '%s'\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, c-format
msgid "keyring '%s' created\n"
msgstr "создана таблица ключей '%s'\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "источник блока ключей '%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, c-format
msgid "error opening key DB: %s\n"
msgstr "ошибка открытия базы данных ключей: %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "сбой пересоставления буфера таблицы ключей: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[отзыв]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[самоподпись]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d плохих подписей\n"
- msgstr[1] "%d плохих подписей\n"
- msgstr[2] "%d плохих подписей\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
#, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "карта не поддерживает хэш-функцию %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "Good signature from"
+ msgid " (reordered signatures follow)"
+ msgstr "Хорошая подпись пользователя"
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "key %s: %s\n"
+ msgid "key %s:\n"
+ msgstr "ключ %s: %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ #| msgid_plural "User ID \"%s\": %d signatures removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "ID пользователя \"%s\": %d подпись удалена\n"
+ msgstr[1] "ID пользователя \"%s\": %d подписи удалены\n"
+ msgstr[2] "ID пользователя \"%s\": %d подписей удалено\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
+ #, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 подпись не проверена за отсутствием ключа\n"
- msgstr[1] "1 подпись не проверена за отсутствием ключа\n"
- msgstr[2] "1 подпись не проверена за отсутствием ключа\n"
+ msgstr[0] "%d подпись не проверена за отсутствием ключа\n"
+ msgstr[1] "%d подписи не проверены за отсутствием ключа\n"
+ msgstr[2] "%d подписей не проверено за отсутствием ключа\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 подпись не проверена из-за ошибки\n"
- msgstr[1] "1 подпись не проверена из-за ошибки\n"
- msgstr[2] "1 подпись не проверена из-за ошибки\n"
++#: g10/keyedit.c:905 g10/keylist.c:471
+ #, c-format
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d плохая подпись\n"
+ msgstr[1] "%d плохих подписи\n"
+ msgstr[2] "%d плохих подписей\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "обнаружено %d ID пользователя без действительной самоподписи\n"
- msgstr[1] "обнаружено %d ID пользователя без действительной самоподписи\n"
- msgstr[2] "обнаружено %d ID пользователя без действительной самоподписи\n"
-
- #: g10/keyedit.c:462 g10/pkclist.c:276
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Хорошая подпись пользователя"
+ msgstr[1] "Хорошая подпись пользователя"
+ msgstr[2] "Хорошая подпись пользователя"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
+
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3670,17 -2906,14 +3727,17 @@@ msgstr "
"достоверности ключей других пользователей (проверяет паспорт,\n"
"сверяет отпечатки ключей из разных источников и т.п.)\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Доверяю ограниченно\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Полностью доверяю\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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,52 -2923,40 +3747,52 @@@ msgstr "
"позволяет ключу, который Вы подписываете, делать подписи доверия\n"
"от Вашего имени.\n"
- #: g10/keyedit.c:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Введите домен, ограничивающий использование данной подписи, или пустую "
"строку, если нет ограничений.\n"
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "ID пользователя \"%s\" пропущен: это не текстовый ID.\n"
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID пользователя \"%s\" отозван."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Вы все равно хотите его подписать? (y/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Не могу подписать.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Срок действия ID пользователя \"%s\" истек."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID пользователя \"%s\" не самозаверен."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID пользователя \"%s\" можно подписать."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "Подписать его? (y/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3744,11 -2965,9 +3801,11 @@@ msgstr "
"Самоподпись у \"%s\" -\n"
"это подпись типа PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Вы хотите преобразовать ее в самоподпись OpenPGP? (y/N) "
- #: g10/keyedit.c:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3757,11 -2976,9 +3814,11 @@@ msgstr "
"Ваша текущая подпись на \"%s\"\n"
"просрочена.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
- #: g10/keyedit.c:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3770,44 -2987,35 +3827,44 @@@ msgstr "
"Ваша текущая подпись на \"%s\"\n"
"является локальной.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Вы хотите преобразовать ее в полную экспортируемую подпись? (y/N) "
- #: g10/keyedit.c:824
++#: g10/keyedit.c:1337
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" уже локально подписан ключом %s\n"
- #: g10/keyedit.c:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" уже подписан ключом %s\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Вы все равно хотите снова подписать его? (y/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Нечего подписывать ключом %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Данный ключ просрочен!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Срок действия данного ключа истекает %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Вы хотите, чтобы Ваша подпись была действительна до того же времени? (Y/n) "
- #: g10/keyedit.c:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3816,31 -3024,25 +3873,31 @@@ msgstr "
"Насколько хорошо Вы проверили, что ключ действительно принадлежит\n"
"указанному выше человеку? Если не знаете, что ответить, введите \"0\".\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Не буду отвечать.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Никакой проверки не было.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Была частичная проверка.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Проверка была очень тщательной.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
msgid "Your selection? (enter '?' for more information): "
msgstr "Ваш выбор? (введите '?' для получения информации): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3849,226 -3051,168 +3906,222 @@@ msgstr "
"Вы уверены, что хотите подписать этот ключ\n"
"своим ключом \"%s\" (%s)?\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Это будет самоподпись.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "Внимание: подпись не будет помечена как неэкспортируемая.\n"
- #: g10/keyedit.c:1010
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "Внимание: подпись не будет помечена как неотзываемая.\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "Подпись будет помечена как неэкспортируемая.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "Подпись будет помечена как неотзываемая.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "Этот ключ мной никак не проверялся.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "Мной проведена поверхностная проверка этого ключа.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "Этот ключ проверен мной очень тщательно.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Действительно подписать? (y/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "подписать не удалось: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"В ключе только заготовка или элементы для карты -\n"
"фразы-пароля для изменения нет.\n"
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "ключ %s: ошибка изменения фразы-пароля: %s\n"
- #: g10/keyedit.c:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "перемещение подписи ключа в нужное место\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "сохранить и выйти"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "показать отпечаток ключа"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
msgid "show the keygrip"
msgstr "показать код ключа"
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "вывести список ключей и ID пользователя"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "выбрать ID пользователя N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "выбрать подключ N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "проверка подписей"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr "подписать выбранные ID пользователя [* описание команд см. ниже]"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "локально подписать выбранные ID пользователя"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "подписать выбранные ID пользователя подписью доверия"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr "подписать выбранные ID пользователя без возможности отзыва"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "добавить ID пользователя"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "добавить фотоидентификатор"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "удалить выбранные ID пользователя"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "добавить подключ"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "добавить ключ на криптографическую карту"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "переместить ключ на криптографическую карту"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "переместить архивный ключ на криптографическую карту"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "удалить выбранные подключи"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "добавить ключ отзыва"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "удалить подписи с выбранных ID пользователя"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
msgid "change the expiration date for the key or selected subkeys"
msgstr "сменить срок действия ключа или выбранных подключей"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "пометить выбранный ID пользователя как первичный"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "список предпочтений (экспертам)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "список предпочтений (подробный)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "установить список предпочтений для выбранных ID пользователя"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"установить URL предпочтительного сервера ключей для выбранных ID пользователя"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "установить примечание для выбранных ID пользователя"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "сменить фразу-пароль"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "изменить уровень доверия владельцу"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "отозвать подписи у выбранных ID пользователя"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "отозвать выбранные ID пользователя"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "отозвать ключ или выбранные подключи"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "подключить ключ"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "отключить ключ"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "показать выбранные фотоидентификаторы"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"сжать непригодные ID пользователей и удалить непригодные подписи из ключа"
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "сжать непригодные ID пользователей и удалить все подписи из ключа"
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Секретный ключ доступен.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Для данного действия нужен секретный ключ.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4079,219 -3223,173 +4132,225 @@@ msgstr "
" 't' (подписи доверия, tsign), 'nr' (неотзываемые, \n"
" nrsign) или любое их сочетание (ltsign, tnrsign и т.д.).\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Ключ отозван."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "Действительно подписать все ID пользователя? (y/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
msgid "Really sign all text user IDs? (y/N) "
msgstr "Действительно подписать все текстовые ID пользователя? (y/N) "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Подсказка: Выберите ID пользователей, которые нужно подписать\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Неизвестный тип подписи '%s'\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Данная команда в режиме %s недопустима.\n"
- #: g10/keyedit.c:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Вы должны выбрать хотя бы один ID пользователя.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Команда '%s'.)\n"
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Вы не можете удалить последний ID пользователя!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Действительно удалить все выбранные ID пользователей? (y/N) "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "Действительно переместить первичный ключ? (y/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "Команде нужен аргумент-имя файла\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Не могу открыть '%s': %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Ошибка чтения архивного ключа из '%s': %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Вы действительно хотите удалить выбранные ключи? (y/N) "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "Вы действительно хотите удалить данный ключ? (y/N) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Действительно отозвать все выбранные ID пользователей? (y/N) "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "Действительно отозвать данный ID пользователя? (y/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Вы действительно хотите отозвать ключ целиком? (y/N) "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N) "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Вы действительно хотите отозвать данный подключ? (y/N) "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Нельзя присваивать степень доверия, когда таблица доверия указана "
"пользователем\n"
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Установить предпочтения в:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Действительно обновить предпочтения для выбранных ID пользователей? (y/N) "
- #: g10/keyedit.c:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Действительно обновить предпочтения? (y/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Сохранить изменения? (y/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Выйти без сохранения? (y/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "сбой при обновлении: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "Ключ не изменялся - обновление не нужно.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" - не отпечаток\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" - не первичный отпечаток\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "недопустимое значение\n"
+
++#: g10/keyedit.c:3099
msgid "No matching user IDs."
msgstr "Нет подходящих ID пользователей."
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
msgid "Nothing to sign.\n"
msgstr "Подписывать нечего.\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Хэш: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Характеристики: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "Не изменять на сервере"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Предпочтительный сервер ключей: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "Примечания: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "В ID пользователя типа PGP 2.x не может быть предпочтений.\n"
- #: g10/keyedit.c:3101
++#: g10/keyedit.c:3620
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
- #: g10/keyedit.c:3125
++#: g10/keyedit.c:3644
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
- #: g10/keyedit.c:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(особо важный)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr " создан: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr " отозван: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "просрочен с: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr " годен до: %s"
@@@ -4299,30 -3397,24 +4358,30 @@@
# perhaps this should be somewhere in help/man
# (S - подпись, C - сертификация, E - шифрование, A - аутентификация)
# too long for repeating messages.
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "назначение: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "номер карты: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "доверие: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "достоверность: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Данный ключ отключен"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4330,18 -3422,13 +4389,18 @@@ msgstr "
"Учтите, что показанная достоверность ключа может быть неверной,\n"
"пока Вы не перезапустите программу.\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "отозван"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "просрочен"
# check it
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4350,15 -3437,12 +4409,15 @@@ msgstr "
" привести к тому, что первичным станет считаться другой\n"
" ID пользователя.\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
msgid "You may want to change its expiration date too.\n"
msgstr "Возможно, надо поменять также срок действия.\n"
- #: g10/keyedit.c:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4367,76 -3451,59 +4426,74 @@@ msgstr "
"Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
" в некоторых версиях PGP вызвать отбраковку ключа.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Вы уверены, что хотите добавить это? (y/N) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
- #: g10/keyedit.c:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr "Такой ID пользователя на этом ключе уже есть!\n"
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Удалить данную действительную подпись? (y/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Удалить данную недействительную подпись? (y/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Удалить данную неизвестную подпись? (y/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Действительно удалить данную самоподпись? (y/N)"
- #: g10/keyedit.c:3727
- #, fuzzy, c-format
- #| msgid "Deleted %d signature.\n"
++#: g10/keyedit.c:4246
+ #, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
msgstr[0] "Удалена %d подпись.\n"
- msgstr[1] "Удалена %d подпись.\n"
- msgstr[2] "Удалена %d подпись.\n"
+ msgstr[1] "Удалены %d подписи.\n"
+ msgstr[2] "Удалено %d подписей.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Ничего не удалено.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "недопустимый"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID пользователя \"%s\" сжат: %s\n"
- #: g10/keyedit.c:3774
- #, fuzzy, c-format
- #| msgid "User ID \"%s\": %d signature removed\n"
++#: g10/keyedit.c:4293
+ #, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "ID пользователя \"%s\": %d подпись удалена\n"
- msgstr[1] "ID пользователя \"%s\": %d подпись удалена\n"
- msgstr[2] "ID пользователя \"%s\": %d подпись удалена\n"
+ msgstr[1] "ID пользователя \"%s\": %d подписи удалены\n"
+ msgstr[2] "ID пользователя \"%s\": %d подписей удалено\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID пользователя \"%s\" уже минимизирован\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID пользователя \"%s\": уже очищен\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4445,36 -3512,28 +4502,36 @@@ msgstr "
"Внимание: Это ключ типа PGP 2.x. Добавление особого отзывающего ключа\n"
" может в некоторых версиях PGP вызвать выбраковку ключа.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Нельзя добавить особый отзывающий ключ в ключ типа PGP 2.x.\n"
- #: g10/keyedit.c:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Укажите ID пользователя ключа, назначенного отзывающим: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "нельзя назначить отзывающим ключ типа PGP 2.x\n"
- #: g10/keyedit.c:3920
++#: g10/keyedit.c:4439
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "ключ не может быть назначен отзывающим самого себя\n"
- #: g10/keyedit.c:3942
++#: g10/keyedit.c:4461
msgid "this key has already been designated as a revoker\n"
msgstr "этот ключ уже назначен отзывающим\n"
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
- #: g10/keyedit.c:3967
++#: g10/keyedit.c:4485
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
- #: g10/keyedit.c:4018
++#: g10/keyedit.c:4536
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
@@@ -4482,224 -3541,174 +4539,224 @@@ msgstr "
"Вы уверены, что хотите изменить срок действия сразу нескольких подключей? (y/"
"N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "Смена срока действия подключа.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Смена срока действия первичного ключа.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Нельзя изменить срок действия ключа v3\n"
- #: g10/keyedit.c:4144
++#: g10/keyedit.c:4768
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "подписывающий подключ %s уже перекрестно заверен\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "подключ %s не для подписей, он не нуждается в перекрестном заверении\n"
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Выберите ровно один ID пользователя.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "пропуск самоподписи v3 на ID пользователя \"%s\"\n"
- #: g10/keyedit.c:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "Введите URL предпочтительного сервера ключей: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Вы действительно хотите заменить его? (y/N) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Вы действительно хотите удалить его? (y/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "Введите примечание: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "Продолжить? (y/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Нет ID пользователя с индексом %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Нет ID пользователя с хэшем %s\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Нет подключа с ID ключа '%s'.\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "Нет подключа с индексом %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID пользователя: \"%s\"\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "подписано Вашим ключом %s %s%s%s\n"
- #: g10/keyedit.c:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (неэкспортируемая)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Срок действия подписи истек %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Вы уверены, что хотите отозвать? (y/N) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "Вами не подписано.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Вы подписали эти ID пользователей на ключе %s:\n"
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (неотзываемая)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "отозвано Вашим ключом %s %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Вы отзываете следующие подписи:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Действительно создать сертификат отзыва? (y/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "нет секретного ключа\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID пользователя \"%s\" уже отозван\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "Внимание: подпись ID пользователя датирована %d секундами в будущем\n"
- #: g10/keyedit.c:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Ключ %s уже отозван.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Подключ %s уже отозван.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ фотоидентификатора %s размера %ld для ключа %s (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "предпочтение '%s' дублируется\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "слишком много шифровых предпочтений\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "слишком много предпочтений для хэш-функций\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "слишком много предпочтений для методов сжатия\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "недопустимый элемент '%s' в строке предпочтений\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "запись прямой подписи\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "запись самоподписи\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "запись объединяющей подписи\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "неверный размер ключа; использую %u бит\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "размер ключа округлен вверх до %u бит\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"Внимание: некоторые реализации OpenPGP не могут обрабатывать ключи DSA с "
"такой длиной хэша\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Подписать"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Заверить"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Зашифровать"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Аутентифицировать"
@@@ -4713,150 -3722,119 +4770,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "11223300"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Возможные действия для ключа %s: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "Допустимы действия: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Переключить возможность использования для подписи\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Переключить возможность использования для шифрования\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Переключить возможность использования для аутентификации\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Завершено\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Выберите тип ключа:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA и RSA (по умолчанию)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA и Elgamal\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (только для подписи)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (только для подписи)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (только для шифрования)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (только для шифрования)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (с требуемыми возможностями)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (с требуемыми возможностями)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC и ECC\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (только для подписи)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (с требуемыми возможностями)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (только для шифрования)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Имеющийся ключ\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "Введите код ключа:"
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Недопустимый код ключа (ожидается 40 шестнадцатеричных цифр)\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "Нет ключа с таким кодом\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "длина ключей %s может быть от %u до %u бит.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Какой размер подключа необходим? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Какой размер ключа Вам необходим? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Запрошенный размер ключа - %u бит\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, c-format
msgid "rounded to %u bits\n"
msgstr "округлен до %u бит\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
msgid "Please select which elliptic curve you want:\n"
msgstr "Выберите эллиптическую кривую:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4872,7 -3850,6 +4929,7 @@@ msgstr "
" <n>m = срок действия ключа - n месяцев\n"
" <n>y = срок действия ключа - n лет\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4888,38 -3865,30 +4945,38 @@@ msgstr "
" <n>m = срок действия подписи - n месяцев\n"
" <n>y = срок действия подписи - n лет\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Срок действия ключа? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Срок действия подписи? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "недопустимое значение\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "Срок действия ключа не ограничен\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "Срок действия подписи не ограничен\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "Ключ действителен до %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "Подпись действительна до %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -4927,11 -3896,9 +4984,11 @@@ msgstr "
"Ваша система не может отображать даты после 2038 года.\n"
"Однако даты до 2106 года будут обрабатываться верно.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Все верно? (y/N) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4945,7 -3912,6 +5002,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -4957,53 -3923,42 +5014,53 @@@ msgstr "
"\n"
"Для идентификации Вашего ключа необходим ID пользователя. Программа создаст "
"его\n"
- "из Вашего имени, комментария и адреса электронной почты в виде:\n"
- " \"Baba Yaga (pensioner) <yaga at deepforest.ru>\"\n"
+ "из Вашего имени, примечания и адреса электронной почты в виде:\n"
+ " \"Вася Пушкин (персонаж) <vp at test.ru>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Ваше полное имя: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Недопустимый символ в имени\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr "Символы '%s' и '%s' в имени появляться не могут\n"
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Имя не должно начинаться с цифры\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Имя не должно быть короче 5 символов\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Адрес электронной почты: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Неправильный адрес электронной почты\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
- msgstr "Комментарий: "
+ msgstr "Примечание: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
- msgstr "Недопустимый символ в комментарии\n"
+ msgstr "Недопустимый символ в примечании\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Используется таблица символов: '%s'.\n"
- #: g10/keygen.c:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5014,10 -3969,9 +5071,10 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
- "Не вставляйте адрес электронной почты в имя пользователя или комментарий\n"
+ "Не вставляйте адрес электронной почты в имя пользователя или примечание\n"
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
@@@ -5030,31 -3984,24 +5087,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "Сменить (N)Имя, (C)Комментарий, (E)Адрес или (Q)Выход? "
+ msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес или (Q)Выход? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2665
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
- msgstr "Сменить (N)Имя, (C)Комментарий, (E)Адрес или (O)Принять/(Q)Выход? "
+ msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес или (O)Принять/(Q)Выход? "
- #: g10/keygen.c:2657
++#: g10/keygen.c:2670
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Сменить (N)Имя, (E)Адрес или (Q)Выход? "
- #: g10/keygen.c:2658
++#: g10/keygen.c:2671
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Сменить (N)Имя, (E)Адрес или (O)Принять/(Q)Выход? "
- #: g10/keygen.c:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Сначала исправьте ошибку\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5067,12 -4014,10 +5124,12 @@@ msgstr "
"случайных чисел больше возможностей получить достаточное количество "
"энтропии.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Сбой при создании ключа: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5083,63 -4028,50 +5140,63 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr "Продолжить? (Y/n) "
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ключ для \"%s\" уже существует\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
msgid "Create anyway? (y/N) "
msgstr "Все равно создать новый? (y/N) "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
msgid "creating anyway\n"
msgstr "принудительное создание\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Замечание: \"%s %s\" вызывает полнофункциональный диалог создания ключа.\n"
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Создание ключа прервано.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "не могу создать архивную копию, файл '%s': %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Замечание: архивная копия ключа с карты сохранена в '%s'\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, c-format
msgid "writing public key to '%s'\n"
msgstr "сохранение открытого ключа в '%s'\n"
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "ошибка записи таблицы открытых ключей '%s': %s\n"
- #: g10/keygen.c:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "открытый и секретный ключи созданы и подписаны.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5147,7 -4079,6 +5204,7 @@@ msgstr "
"Учтите, что данный ключ не может использоваться для шифрования. Вы можете\n"
"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5155,7 -4086,6 +5212,7 @@@ msgstr "
"ключ создан на %lu секунду в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5163,640 -4093,506 +5220,638 @@@ msgstr "
"ключ создан на %lu секунд в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "Замечание: создание подключей для ключей v3 не совместимо с OpenPGP\n"
- #: g10/keygen.c:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Секретные части первичного ключа отсутствуют.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Секретные части первичного ключа хранятся на карте.\n"
- #: g10/keygen.c:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Действительно создать? (y/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "никогда "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Критические правила подписи: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Правила подписи: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Критический предпочтительный сервер ключей: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Критическое примечание к подписи: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Примечание к подписи: "
- #: g10/keylist.c:468
- #, fuzzy, c-format
- #| msgid "%d good signatures\n"
++#: g10/keylist.c:467
+ #, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
- msgstr[0] "%d хороших подписей\n"
- msgstr[1] "%d хороших подписей\n"
+ msgstr[0] "%d хорошая подпись\n"
+ msgstr[1] "%d хороших подписи\n"
msgstr[2] "%d хороших подписей\n"
- #: g10/keylist.c:563
- #, fuzzy, c-format
- #| msgid "Warning: %lu key(s) skipped due to their large size\n"
++#: g10/keylist.c:480
+ #, c-format
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "%d подпись не проверена из-за ошибки\n"
+ msgstr[1] "%d подписи не проверены из-за ошибки\n"
+ msgstr[2] "%d подписей не проверено из-за ошибки\n"
+
++#: g10/keylist.c:562
+ #, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
- msgstr[0] "Внимание: %lu ключей пропущено из-за большого размера\n"
- msgstr[1] "Внимание: %lu ключей пропущено из-за большого размера\n"
+ msgstr[0] "Внимание: %lu ключ пропущен из-за большого размера\n"
+ msgstr[1] "Внимание: %lu ключа пропущены из-за большого размера\n"
msgstr[2] "Внимание: %lu ключей пропущено из-за большого размера\n"
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Таблица ключей"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "пропущено \"%s\": %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Отпечаток главного ключа:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Отпечаток главного ключа:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " Отпечаток ключа ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " серийный номер карты ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, c-format
msgid "caching keyring '%s'\n"
msgstr "занесение таблицы ключей '%s' в буфер\n"
- #: g10/keyring.c:1567
- #, fuzzy, c-format
- #| msgid "%lu keys cached so far (%lu signatures)\n"
++#: g10/keyring.c:1566
+ #, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
- msgstr[0] "пока в буфер помещено %lu ключей (%lu подписей)\n"
- msgstr[1] "пока в буфер помещено %lu ключей (%lu подписей)\n"
+ msgstr[0] "пока в буфер помещено %lu ключей (%lu подпись)\n"
+ msgstr[1] "пока в буфер помещено %lu ключей (%lu подписи)\n"
msgstr[2] "пока в буфер помещено %lu ключей (%lu подписей)\n"
- #: g10/keyring.c:1583
- #, fuzzy, c-format
- #| msgid "flush the cache"
++#: g10/keyring.c:1582
+ #, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
- msgstr[0] "записать буфер на диск"
- msgstr[1] "записать буфер на диск"
- msgstr[2] "записать буфер на диск"
+ msgstr[0] "в буфер записан %lu ключ"
+ msgstr[1] "в буфер записаны %lu ключа"
+ msgstr[2] "в буфер записано %lu ключей"
- #: g10/keyring.c:1585
- #, fuzzy, c-format
- #| msgid "1 bad signature\n"
++#: g10/keyring.c:1584
+ #, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
- msgstr[0] "1 плохая подпись\n"
- msgstr[1] "1 плохая подпись\n"
- msgstr[2] "1 плохая подпись\n"
+ msgstr[0] "(%lu подпись)\n"
+ msgstr[1] "(%lu подписи)\n"
+ msgstr[2] "(%lu подписей)\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: таблица ключей создана\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr "переназначить настройки промежуточного сервера для dirmngr"
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "включить в результаты поиска отозванные ключи"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "искать по ID ключа, включая подключи"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr "переназначить настройки времени ожидания для dirmngr"
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "автоматически получать ключи при проверке подписей"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr "учитывать набор URL предпочтительных серверов ключей для этого ключа"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "учитывать набор записей PKA при получении ключей"
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "отключен"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Введите числа, N) Следующее или Q) Выход> "
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "недопустимый протокол сервера ключей (ожидается %d, получено %d)\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" - не ID ключа: пропущен\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
- #, fuzzy, c-format
- #| msgid "refreshing %d keys from %s\n"
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
+ #, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
- msgstr[0] "обновление %d ключей из %s\n"
+ msgstr[0] "обновление %d ключа из %s\n"
msgstr[1] "обновление %d ключей из %s\n"
msgstr[2] "обновление %d ключей из %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "Внимание: невозможно обновить ключ %s с %s: %s\n"
- #: g10/keyserver.c:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "ключ \"%s\" не найден на сервере ключей\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "ключ не найден на сервере ключей\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "не заданы серверы ключей (используйте --keyserver)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "запрашиваю ключ %s с сервера %s %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "получение ключа %s с %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
- #, fuzzy
- #| msgid "invalid keyserver options\n"
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
msgid "no keyserver known\n"
- msgstr "недопустимые параметры сервера ключей\n"
+ msgstr "ни один сервер ключей не известен\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "отправка ключа %s на %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, c-format
msgid "requesting key from '%s'\n"
msgstr "запрос ключа из '%s'\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Внимание: невозможно получить URI %s: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "сеансовый ключ зашифрован по %s\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "фраза-пароль создана с незнакомой хэш-функцией %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "открытый ключ - %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "данные зашифрованы открытым ключом: хороший DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
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:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "зашифровано ключом %s с ID %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "сбой расшифровки с открытым ключом: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "зашифровано %lu фразами-паролями\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "зашифровано одной фразой-паролем\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "предполагаются данные, зашифрованные по %s\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "шифр IDEA недоступен, попробую вместо него %s\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "Внимание: целостность сообщения не защищена\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "расшифровано нормально\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "Внимание: зашифрованное сообщение было изменено!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "сбой расшифровки: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "Замечание: отправитель запросил \"только между нами\"\n"
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "первоначальное имя файла='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "Внимание: наблюдается несколько текстов\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "отдельный сертификат отзыва: задействуется командой \"gpg --import\"\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "подпись не найдена\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПЛОХАЯ подпись пользователя \"%s\""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Просроченная подпись пользователя \"%s\""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "Действительная подпись пользователя \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "проверка подписи подавлена\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "не могу обработать эти неоднозначные данные подписи\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Подпись сделана %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " ключом %s с ID %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Подпись сделана %s ключом %s с ID %s\n"
- #: g10/mainproc.c:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Ключ доступен на: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[сомнительно]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " или \"%s\""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Подпись просрочена %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Подпись действительна до %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "формат подписи: %s, хэш-функция %s%s%s\n"
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "двоичный"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "текстовый"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "неизвестно"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
msgid ", key algorithm "
msgstr ", алгоритм ключа "
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "Внимание: не отделенная подпись; файл '%s' НЕ был проверен!\n"
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не могу проверить подпись: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "не отделенная подпись\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"Внимание: обнаружено несколько подписей. Проверена будет только первая.\n"
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "отдельная подпись класса 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "подпись старого типа (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "сбой fstat '%s' в функции %s: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "сбой fstat(%d) в функции %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr ""
"Внимание: используется экспериментальный алгоритм шифрования с открытым "
"ключом %s\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "Внимание: Ключи для подписи+шифрования Elgamal не рекомендуются\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr ""
"Внимание: используется экспериментальный алгоритм симметричного шифрования "
"%s\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "Внимание: используется экспериментальная хэш-функция %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "Внимание: хэш-функция %s не рекомендуется\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Замечание: подписи с хэш-функцией %s игнорируются\n"
- #: g10/misc.c:377
- #, fuzzy, c-format
- #| msgid "%s:%u: read error: %s\n"
++#: g10/misc.c:375
+ #, c-format
msgid "(reported error: %s)\n"
- msgstr "%s:%u: ошибка чтения: %s\n"
+ msgstr "(сообщенная ошибка: %s)\n"
- #: g10/misc.c:380
- #, fuzzy, c-format
- #| msgid "read error in '%s': %s\n"
++#: g10/misc.c:378
+ #, c-format
msgid "(reported error: %s <%s>)\n"
- msgstr "ошибка чтения в '%s': %s\n"
+ msgstr "(сообщенная ошибка: %s <%s>)\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
- msgstr ""
+ msgstr "(дальнейшие сведения: "
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: параметр \"%s\" не рекомендуется\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "Внимание: параметр \"%s\" не рекомендуется\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "используйте вместо этого \"%s%s\"\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr ""
"Внимание: команда \"%s\" не рекомендуется к употреблению - не применяйте ее\n"
- #: g10/misc.c:1081
++#: g10/misc.c:1079
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: \"%s\" в этом файле устарело - оно действует только в %s\n"
- #: g10/misc.c:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Без сжатия"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "без сжатия|без|none"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "данное сообщение может быть непригодно для %s\n"
- #: g10/misc.c:1469
++#: g10/misc.c:1467
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "неоднозначный параметр '%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, c-format
msgid "unknown option '%s'\n"
msgstr "неизвестный параметр '%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "Открытый ключ ECDSA бывает в кодировке SEC, кратной 8 битам\n"
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, c-format
msgid "unknown weak digest '%s'\n"
msgstr "неизвестный слабый хэш '%s'\n"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, c-format
msgid "File '%s' exists. "
msgstr "Файл '%s' существует. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Записать поверх? (y/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: неизвестное окончание\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Введите новое имя файла"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "вывод в stdout\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "предполагается, что подписанные данные находятся в '%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, c-format
msgid "new configuration file '%s' created\n"
msgstr "создан новый файл настроек '%s'\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "Внимание: параметры в '%s' при этом запуске еще не действуют\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "не могу использовать алгоритм с открытым ключом %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"Внимание: потенциально небезопасный сеансовый ключ,\n"
" зашифрованный симметричным шифром\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "в подпакете типа %d установлен критический бит\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "проблема с агентом: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (ID главного ключа %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -5810,15 -4606,12 +5865,15 @@@ msgstr "
"%u-битный ключ %s, ID %s,\n"
"создан %s%s.\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Введите фразу-пароль\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "прервано пользователем\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -5826,41 -4619,32 +5881,41 @@@
msgstr ""
"Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-битный ключ %s, ID %s, создан %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (подключ на главном ключе %s)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Введите фразу-пароль для разблокировки секретного ключа OpenPGP:"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Введите фразу-пароль для импорта секретного ключа OpenPGP:"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Введите фразу-пароль для экспорта секретного подключа OpenPGP:"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Введите фразу-пароль для экспорта секретного ключа OpenPGP:"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Вы действительно хотите навсегда удалить секретный подключ OpenPGP:"
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Вы действительно хотите навсегда удалить секретный ключ OpenPGP:"
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, c-format
msgid ""
"%s\n"
@@@ -5920,31 -4696,24 +5975,31 @@@ msgstr "Это правильная ф�
msgid "unable to display photo ID!\n"
msgstr "не могу отобразить фотоидентификатор!\n"
- #: g10/pkclist.c:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Причина не указана"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Ключ заменен другим"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Ключ был раскрыт"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Ключ больше не используется"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "ID пользователя больше не действителен"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "причина отзыва: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "пояснение к отзыву: "
@@@ -5958,53 -4727,42 +6013,53 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Не задано значение доверия для:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " или \"%s\"\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"Насколько Вы уверены, что данный ключ принадлежит названному пользователю?\n"
- #: g10/pkclist.c:284
++#: g10/pkclist.c:283
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Не знаю или не буду отвечать\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = НЕ доверяю\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Абсолютно доверяю\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = вернуться в главное меню\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = пропустить этот ключ\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " q = выход\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6013,41 -4771,33 +6068,41 @@@ msgstr "
"Минимальный уровень доверия данному ключу: %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Ваше решение? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "Вы действительно хотите сделать этот ключ абсолютно доверенным? (y/N) "
- #: g10/pkclist.c:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Сертификаты, ведущие к абсолютно доверенному ключу:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: Нет свидетельств того, что данный ключ принадлежит названному "
"пользователю\n"
- #: g10/pkclist.c:441
++#: g10/pkclist.c:440
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: Мало свидетельств того, что данный ключ принадлежит названному "
"пользователю\n"
- #: g10/pkclist.c:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "Этот ключ, вероятно, принадлежит названному владельцу\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Данный ключ принадлежит нам\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6057,127 -4807,98 +6112,126 @@@ msgstr "
"в ID пользователя. Если Вы ТОЧНО знаете, что делаете,\n"
"можете ответить на следующий вопрос утвердительно.\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "Все равно использовать данный ключ? (y/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "Внимание: Использование недоверенного ключа!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "Внимание: возможно, данный ключ отозван (ключ отзыва отсутствует)\n"
- #: g10/pkclist.c:547
++#: g10/pkclist.c:562
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "Внимание: Данный ключ отозван ключом, назначенным отзывающим!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "Внимание: Данный ключ отозван его владельцем!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " Это может означать, что подпись подделана.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "Внимание: Данный подключ был отозван его владельцем!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Замечание: Данный ключ отключен.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Замечание: Проверенный адрес подписавшего - '%s'\n"
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Замечание: Адрес подписавшего '%s' не соответствует данным DNS\n"
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "уровень доверия установлен в ПОЛНОСТЬЮ по действительным данным PKA\n"
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "уровень доверия установлен в НИКОГДА из-за непригодных данных PKA\n"
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Замечание: Данный ключ просрочен!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "Внимание: Данный ключ не заверен доверенной подписью!\n"
- #: g10/pkclist.c:633
++#: g10/pkclist.c:648
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Нет указаний на то, что подпись принадлежит владельцу.\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "Внимание: НЕТ ДОВЕРИЯ данному ключу!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Возможно, что подпись ПОДДЕЛАНА.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"Внимание: Этот ключ не заверен достаточным количеством доверенных подписей!\n"
- #: g10/pkclist.c:652
++#: g10/pkclist.c:667
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Нет уверенности в том, что подпись принадлежит владельцу.\n"
- #: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: открытый ключ отключен\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: открытый ключ уже существует\n"
- #: g10/pkclist.c:943
- #, fuzzy, c-format
- #| msgid "can't connect to '%s': %s\n"
++#: g10/pkclist.c:958
+ #, c-format
msgid "can't encrypt to '%s'\n"
- msgstr "не могу подключиться к '%s': %s\n"
+ msgstr "не могу зашифровать для '%s'\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "задан параметр '%s', но не заданы ключи по умолчанию\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "задан параметр '%s', но параметр '%s' не задан\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Не задан ID пользователя (можно использовать \"-r\").\n"
- #: g10/pkclist.c:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Текущие получатели:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6185,167 -4906,128 +6239,164 @@@ msgstr "
"\n"
"Введите ID пользователя. Завершите пустой строкой: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Нет такого ID пользователя.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Открытый ключ отключен.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "пропущено: открытый ключ уже установлен\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "неизвестный получатель по умолчанию \"%s\"\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "нет пригодных адресов\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Замечание: у ключа %s нет функции %s\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Замечание: у ключа %s нет предпочтения для %s\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Отделенная подпись.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Введите имя файла с данными: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "читаю stdin ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "нет подписанных данных\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "не могу открыть подписанные данные '%s'\n"
- #: g10/plaintext.c:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "не могу открыть подписанные данные fd=%d: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "анонимный получатель; пробую секретный ключ %s ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "отлично, мы - анонимный получатель.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "старая кодировка DEK не поддерживается\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "алгоритм шифрования %d%s неизвестен или отключен\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"Внимание: в списке предпочтений получателя алгоритм шифрования %s не найден\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "Замечание: секретный ключ %s просрочен с %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "сбой build_packet: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "у ключа %s нет ID пользователя\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Будет отозван:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Это особо важный ключ отзыва)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
msgid "Secret key is not available.\n"
msgstr "Секретный ключ недоступен.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Создать сертификат отзыва данного ключа? (y/N) "
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "Для вывода использован текстовый формат ASCII.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "сбой make_keysig_packet: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Сертификат отзыва создан.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "ключи отзыва для \"%s\" не найдены\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Это сертификат отзыва ключа OpenPGP:"
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
+ "Сертификат отзыва - своего рода \"уничтожитель\", с его помощью можно\n"
+ "публично объявить, что ключ больше не должен применяться. После публикации\n"
+ "такой сертификат взять назад невозможно."
- #: g10/revoke.c:571
- #, fuzzy
- #| msgid ""
- #| "Use it to revoke this key in case of a compromise or loss of\n"
- #| "the secret key. However, if the secret key is still accessible,\n"
- #| "it is better to generate a new revocation certificate and give\n"
- #| "a reason for the revocation."
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6355,14 -5037,9 +6406,10 @@@
msgstr ""
"Пользуйтесь им для отзыва этого ключа в случае раскрытия или потери\n"
"секретного ключа. Однако, если секретный ключ доступен, лучше создать\n"
- "новый сертификат с указанием причины отзыва."
+ "новый сертификат с указанием причины отзыва. Подробности см. в описании\n"
+ "команды gpg \"--gen-revoke\" в руководстве по GnuPG."
- #: g10/revoke.c:576
- #, fuzzy
- #| msgid ""
- #| "To avoid an accidental use of this file, a colon has been inserted\n"
- #| "before the 5 dashes below. Remove this colon with a text editor\n"
- #| "before making use of this revocation certificate."
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
@@@ -6370,15 -5047,12 +6417,14 @@@
msgstr ""
"Чтобы избежать случайного применения этого файла, перед 5 дефисами\n"
"вставлено двоеточие. Удалите это двоеточие в текстовом редакторе\n"
- "перед использованием этого сертификата отзыва."
+ "перед импортированием и публикацией этого сертификата отзыва."
- #: g10/revoke.c:591
- #, fuzzy, c-format
- #| msgid "Revocation certificate created.\n"
++#: g10/revoke.c:590
+ #, c-format
msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "Сертификат отзыва создан.\n"
+ msgstr "сертификат отзыва записан в '%s.rev'.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, c-format
msgid "secret key \"%s\" not found\n"
msgstr "секретный ключ \"%s\" не найден\n"
@@@ -6386,21 -5060,17 +6432,21 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr "'%s' соответствует нескольким секретным ключам:\n"
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, c-format
msgid "error searching the keyring: %s\n"
msgstr "ошибка поиска в таблице ключей %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Создать сертификат отзыва данного ключа? (y/N) "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6419,97 -5089,75 +6465,93 @@@ msgstr "
"носитель будет поврежден, но будьте осторожны: система печати\n"
"Вашей машины может сохранить данные и сделать их доступными для других!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Укажите причину отзыва:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Отмена"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Скорее всего, Вы здесь выберете %d)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Введите необязательное пояснение; завершите пустой строкой:\n"
- #: g10/revoke.c:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Причина отзыва: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Пояснения отсутствуют)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Все правильно? (y/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "создан слабый ключ - повторение\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"невозможно избежать слабого ключа для симметричного шифра; %d попыток!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "ключ %s %s использует небезопасный (%zu-битный) хэш\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
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:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "Внимание: конфликт хэшей подписей в сообщении\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "Внимание: подписывающий подключ %s не был перекрестно заверен\n"
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "за подробностями обращайтесь к %s\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "Внимание: подписывающий подключ %s неправильно перекрестно заверен\n"
- #: g10/sig-check.c:275
- #, fuzzy, c-format
- #| msgid "public key %s is %lu second newer than the signature\n"
++#: g10/sig-check.c:277
+ #, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "открытый ключ %s на %lu секунду новее подписи\n"
- msgstr[1] "открытый ключ %s на %lu секунду новее подписи\n"
- msgstr[2] "открытый ключ %s на %lu секунду новее подписи\n"
+ msgstr[1] "открытый ключ %s на %lu секунды новее подписи\n"
+ msgstr[2] "открытый ключ %s на %lu секунд новее подписи\n"
- #: g10/sig-check.c:284
- #, fuzzy, c-format
- #| msgid "public key %s is %lu second newer than the signature\n"
++#: g10/sig-check.c:286
+ #, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "открытый ключ %s на %lu секунду новее подписи\n"
- msgstr[1] "открытый ключ %s на %lu секунду новее подписи\n"
- msgstr[2] "открытый ключ %s на %lu секунду новее подписи\n"
+ msgstr[0] "открытый ключ %s на %lu день новее подписи\n"
+ msgstr[1] "открытый ключ %s на %lu дня новее подписи\n"
+ msgstr[2] "открытый ключ %s на %lu дней новее подписи\n"
- #: g10/sig-check.c:298 g10/sign.c:238
- #, fuzzy, c-format
- #| msgid ""
- #| "key %s was created %lu second in the future (time warp or clock problem)\n"
++#: g10/sig-check.c:300 g10/sign.c:237
+ #, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6518,63 -5166,53 +6560,61 @@@ msgstr[0] "
"ключ %s создан на %lu секунду в будущем (петля во времени или проблемы с "
"часами)\n"
msgstr[1] ""
- "ключ %s создан на %lu секунду в будущем (петля во времени или проблемы с "
+ "ключ %s создан на %lu секунды в будущем (петля во времени или проблемы с "
"часами)\n"
msgstr[2] ""
- "ключ %s создан на %lu секунду в будущем (петля во времени или проблемы с "
+ "ключ %s создан на %lu секунд в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/sig-check.c:307
- #, fuzzy, c-format
- #| msgid ""
- #| "key %s was created %lu second in the future (time warp or clock problem)\n"
++#: g10/sig-check.c:309
+ #, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
"key %s was created %lu days in the future (time warp or clock problem)\n"
msgstr[0] ""
- "ключ %s создан на %lu секунду в будущем (петля во времени или проблемы с "
+ "ключ %s создан на %lu день в будущем (петля во времени или проблемы с "
"часами)\n"
msgstr[1] ""
- "ключ %s создан на %lu секунду в будущем (петля во времени или проблемы с "
+ "ключ %s создан на %lu дня в будущем (петля во времени или проблемы с "
"часами)\n"
msgstr[2] ""
- "ключ %s создан на %lu секунду в будущем (петля во времени или проблемы с "
+ "ключ %s создан на %lu дней в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "Замечание: срок действия подписавшего ключа %s истек %s\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "Замечание: ключ для подписей %s отозван\n"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"подпись ключа %s считается плохой из-за неизвестного критического бита\n"
- #: g10/sig-check.c:801
++#: g10/sig-check.c:1043
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "ключ %s: нет подключа для отзывающей подписи подключа\n"
- #: g10/sig-check.c:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "ключ %s: нет подключа для подписи связи подключей\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"Внимание: не могу развернуть %% в примечании (слишком длинное).\n"
" Использую неразвернутым.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6582,7 -5220,6 +6622,7 @@@ msgstr "
"Внимание: не могу развернуть %% в URL правил (слишком длинный). Использую "
"неразвернутым.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6591,12 -5228,10 +6631,12 @@@ msgstr "
"Внимание: невозможно развернуть %% в URL предпочтительного сервера ключей "
"(слишком длинный). Использую неразвернутым.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "подпись %s/%s пользователя \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6604,41 -5239,33 +6644,41 @@@ msgstr "
"Внимание: использование хэш-функции %s (%d) нарушает предпочтения "
"получателя\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "подпись:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "будет использовано шифрование по %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"ключ не помечен как небезопасный - не могу использовать его с фальшивым "
"генератором случайных чисел!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "пропущено \"%s\": дубликат\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "пропущено: секретный ключ уже имеется\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"это ключ Elgamal, созданный PGP, он не обеспечивает безопасность подписи!"
- #: g10/tdbdump.c:58 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6647,346 -5274,273 +6687,339 @@@ msgstr "
"# Список присвоенных значений доверия создан %s\n"
"# (Используйте \"gpg --import-ownertrust\" для их восстановления)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, c-format
msgid "error in '%s': %s\n"
msgstr "ошибка в '%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "слишком длинная строка"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "пропущено двоеточие"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "неверный отпечаток"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "пропущено значение степени доверия владельцу"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "ошибка при поиске записи о доверии в '%s': %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, c-format
msgid "read error in '%s': %s\n"
msgstr "ошибка чтения в '%s': %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "таблица доверия: сбой синхронизации: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "невозможно создать блокировку для '%s'\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, c-format
msgid "can't lock '%s'\n"
msgstr "невозможно заблокировать '%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "таблица доверия, запись %lu: сбой lseek: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "таблица доверия, запись %lu: сбой записи (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "слишком большая операция над таблицей доверия\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
- #, c-format
- msgid "can't access '%s': %s\n"
- msgstr "нет доступа к '%s': %s\n"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: каталог не существует!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "нет доступа к '%s': %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: сбой создания записи о версии: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: создана недопустимая таблица доверия\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: создана таблица доверия\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
msgid "Note: trustdb not writable\n"
msgstr "Замечание: таблица доверия недоступна для записи\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: недопустимая таблица доверия\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: сбой создания таблицы хэшей: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: ошибка обновления записи о версии: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: ошибка чтения записи о версии: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: ошибка сохранения записи о версии: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "таблица доверия: сбой lseek: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "таблица доверия: сбой чтения (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: не является файлом таблицы доверия\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: запись о версии с номером записи %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: неправильная версия файла %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: ошибка чтения свободной записи: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: ошибка сохранения записи каталога: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: сбой обнуления записи: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: сбой добавления записи: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "Ошибка: таблица доверия повреждена.\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "не могу обработать строки текста длиннее %d символов\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "строка ввода длиннее %d символов\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
- #, fuzzy, c-format
- #| msgid "error sending standard options: %s\n"
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
+ #, c-format
msgid "error beginning transaction on TOFU database: %s\n"
- msgstr "ошибка отправки стандартных параметров: %s\n"
+ msgstr "ошибка в начале операции с базой данных TOFU: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
- msgstr ""
+ msgstr "ошибка записи изменения в базе данных TOFU: %s\n"
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
- msgstr ""
+ msgstr "ошибка отката назад изменения в базе данных TOFU: %s\n"
- #: g10/tofu.c:451
- #, fuzzy, c-format
- #| msgid "unsupported algorithm: %s"
++#: g10/tofu.c:512
+ #, c-format
msgid "unsupported TOFU database version: %s\n"
- msgstr "алгоритм (не поддерживается): %s"
+ msgstr "версия базы данных TOFU (не поддерживается): %s\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
- #, fuzzy, c-format
- #| msgid "error sending data: %s\n"
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
+ #, c-format
msgid "error reading TOFU database: %s\n"
- msgstr "ошибка отправки данных: %s\n"
+ msgstr "ошибка чтения базы данных TOFU: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
- #, fuzzy, c-format
- #| msgid "error writing base64 encoding: %s\n"
++#: g10/tofu.c:577 g10/tofu.c:585
+ #, c-format
msgid "error determining TOFU database's version: %s\n"
- msgstr "ошибка записи в кодировке base64: %s\n"
+ msgstr "ошибка определения версии базы данных TOFU: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
- #, fuzzy, c-format
- #| msgid "error initializing reader object: %s\n"
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
+ #, c-format
msgid "error initializing TOFU database: %s\n"
- msgstr "ошибка инициализации объекта устройства чтения: %s\n"
+ msgstr "ошибка инициализации базы данных TOFU: %s\n"
- #: g10/tofu.c:700
- #, fuzzy, c-format
- #| msgid "error opening '%s': %s\n"
++#: g10/tofu.c:761
+ #, c-format
msgid "error opening TOFU database '%s': %s\n"
- msgstr "ошибка открытия '%s': %s\n"
+ msgstr "ошибка открытия базы данных TOFU '%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
+ msgstr "Внимание: Домашний каталог содержит как tofu.db, так и tofu.d\n"
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
- msgstr ""
+ msgstr "Используется разделенный формат базы данных TOFU\n"
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
- #, fuzzy, c-format
- #| msgid "error sending data: %s\n"
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
+ #, c-format
msgid "error updating TOFU database: %s\n"
- msgstr "ошибка отправки данных: %s\n"
+ msgstr "ошибка обновления базы данных TOFU: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "открытый ключ %s не найден: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
- #, fuzzy, c-format
- #| msgid "error setting OCSP target: %s\n"
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
+ #, c-format
msgid "error setting TOFU binding's trust level to %s\n"
- msgstr "ошибка установки цели OCSP: %s\n"
+ msgstr "ошибка установки уровня доверия привязки TOFU в %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
- msgstr ""
+ msgstr "Привязка %s неизвестна."
- #: g10/tofu.c:1832
- #, c-format
++#: g10/tofu.c:1880
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "The key %s raised a conflict with this binding (%s). Since this "
+ #| "binding's policy was 'auto', it was changed to 'ask'."
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
+ "Ключ %s противоречит этой привязке (%s). Поскольку правило привязки было "
+ "'автоматически', оно изменилось на 'спрашивать'."
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
+ "Укажите, считаете ли Вы привязку %s%sправомерной (ключ принадлежит "
+ "заявленному владельцу) или поддельной (плохой)."
- #: g10/tofu.c:1876
- #, fuzzy, c-format
- #| msgid "error getting responder ID: %s\n"
++#: g10/tofu.c:1937
+ #, c-format
msgid "error gathering other user IDs: %s\n"
- msgstr "ошибка при получении ID ответчика: %s\n"
+ msgstr "ошибка при сборе ID других пользователей: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
- msgstr ""
+ msgstr "Известные ID пользователя, связанные с этим ключом:\n"
- #: g10/tofu.c:1906 g10/tofu.c:1999
- #, fuzzy, c-format
- #| msgid "validity: %s"
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
+ #, c-format
msgid "policy: %s"
- msgstr "достоверность: %s"
+ msgstr "правило: %s"
- #: g10/tofu.c:1957
- #, fuzzy, c-format
- #| msgid "error getting stored flags: %s\n"
++#: g10/tofu.c:2018
+ #, c-format
msgid "error gathering signature stats: %s\n"
- msgstr "ошибка получения сохраненных признаков: %s\n"
+ msgstr "ошибка сбора статистики подписей: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "Адрес электронной почты \"%s\" связан с %d ключом:\n"
+ msgstr[1] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
+ msgstr[2] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
- msgstr ""
+ msgstr "Статистика ключей с адресом электронной почты \"%s\":\n"
- #: g10/tofu.c:1997
- #, fuzzy
- #| msgid "list keys"
++#: g10/tofu.c:2058
msgid "this key"
- msgstr "вывести список ключей"
+ msgstr "этот ключ"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "%ld сообщение подписано в будущем."
+ msgstr[1] "%ld сообщения подписаны в будущем."
+ msgstr[2] "%ld сообщений подписано в будущем."
- #: g10/tofu.c:2016
- #, fuzzy, c-format
- #| msgid "print message digests"
++#: g10/tofu.c:2077
+ #, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
- msgstr[0] "вывести хэши сообщений"
- msgstr[1] "вывести хэши сообщений"
- msgstr[2] "вывести хэши сообщений"
+ msgstr[0] "%ld сообщение подписано"
+ msgstr[1] "%ld сообщения подписаны"
+ msgstr[2] "%ld сообщений подписано"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] " за %ld прошедший день."
+ msgstr[1] " за %ld прошедших дня."
+ msgstr[2] " за %ld прошедших дней."
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] " за %ld прошедшую неделю."
+ msgstr[1] " за %ld прошедших недели."
+ msgstr[2] " за %ld прошедших недель."
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -6997,183 -5551,193 +7030,224 @@@ msgstr[2] " за %ld прошедши�
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
+ "Обычно с конкретным адресом электронной почты связан только один ключ. "
+ "Однако иногда создают новый ключ, например, если ключ слишком стар или "
+ "владелец считает, что ключ может быть раскрыт. В противном случае новый ключ "
+ "может означать атаку \"человек посередине\"! Перед тем как принять этот "
+ "ключ, следует связаться с владельцем и убедиться, что этот новый ключ "
+ "правомерен."
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
- msgstr ""
+ msgstr "gGaAuUrRbB"
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
+ "(G)Хороший, (A)Пока принять, (U)Неясно, (R)Пока отвергнуть, (B)Плохой? "
- #: g10/tofu.c:2162
- #, fuzzy, c-format
- #| msgid "error creating a pipe: %s\n"
- msgid "error changing TOFU policy: %s\n"
- msgstr "ошибка при создании канала конвейера: %s\n"
-
- #: g10/tofu.c:2252
- #, c-format
- msgid "%d year"
- msgid_plural "%d years"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
-
- #: g10/tofu.c:2261
- #, c-format
- msgid "%d month"
- msgid_plural "%d months"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
-
- #: g10/tofu.c:2270
- #, c-format
- msgid "%d day"
- msgid_plural "%d days"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
-
- #: g10/tofu.c:2279
++#: g10/tofu.c:2224
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgid "error changing TOFU policy: %s\n"
+ msgstr "ошибка при смене правила TOFU: %s\n"
- #: g10/tofu.c:2288
- #, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
+ #, fuzzy, c-format
+ #| msgid "%d year"
+ #| msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
+ msgstr[0] "%d год"
+ msgstr[1] "%d года"
+ msgstr[2] "%d лет"
+
++#: g10/tofu.c:2326
+ #, fuzzy, c-format
+ #| msgid "%d month"
+ #| msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
+ msgstr[0] "%d месяц"
+ msgstr[1] "%d месяца"
+ msgstr[2] "%d месяцев"
+
++#: g10/tofu.c:2335
+ #, c-format
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2297
- #, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
++#: g10/tofu.c:2344
+ #, fuzzy, c-format
+ #| msgid "%d hour"
+ #| msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
+ msgstr[0] "%d час"
+ msgstr[1] "%d часа"
+ msgstr[2] "%d часов"
+
++#: g10/tofu.c:2353
+ #, fuzzy, c-format
+ #| msgid "%d minute"
+ #| msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
+ msgstr[0] "%d минута"
+ msgstr[1] "%d минуты"
+ msgstr[2] "%d минут"
+
++#: g10/tofu.c:2362
+ #, fuzzy, c-format
+ #| msgid "%d second"
+ #| msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
+ msgstr[0] "%d секунда"
+ msgstr[1] "%d секунды"
+ msgstr[2] "%d секунд"
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
- msgstr ""
+ msgstr "Сообщения, подписанные ключом %s, никогда не проверялись!\n"
- #: g10/tofu.c:2400
- #, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
- msgstr ""
++#: g10/tofu.c:2479
+ #, fuzzy, c-format
+ #| msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
+ msgstr "Не удалось собрать статистику для \"%s\" (ключ %s)\n"
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "Проверено 0 сообщений, подписанных \"%s\" (ключ: %s, правило: %s)."
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
- #, c-format
++#: g10/tofu.c:2510
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past "
+ #| "%s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past "
+ #| "%s."
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
+ "Проверено %ld сообщение, подписанное \"%s\" (ключ: %s, правило: %s) за %s."
msgstr[1] ""
+ "Проверены %ld сообщения, подписанные \"%s\" (ключ: %s, правило: %s) за %s."
msgstr[2] ""
+ "Проверено %ld сообщений, подписанных \"%s\" (ключ: %s, правило: %s) за %s."
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
- msgstr ""
+ msgstr "Последнее сообщение проверено %s назад."
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
+ "Внимание: мы до сих пор не видели ни одного сообщения, подписанного этим "
+ "ключом!\n"
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
+ "Внимание: мы до сих пор видели только одно сообщение, подписанное этим "
+ "ключом!\n"
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
- #, fuzzy, c-format
- #| msgid "error sending data: %s\n"
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
+ #, c-format
msgid "error opening TOFU database: %s\n"
- msgstr "ошибка отправки данных: %s\n"
+ msgstr "ошибка при открытии базы данных TOFU: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "'%s' не является допустимым длинным ID ключа\n"
- #: g10/trustdb.c:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "ключ %s: принят как доверенный ключ\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "ключ %s встречается в таблице доверия более одного раза\n"
- #: g10/trustdb.c:295
++#: g10/trustdb.c:294
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "ключ %s: нет открытого ключа для доверенного ключа - пропущен\n"
- #: g10/trustdb.c:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "ключ %s помечен как абсолютно доверенный\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "запись о доверии %lu, тип запроса %d: сбой чтения: %s\n"
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "тип записи о доверии %lu отличается от запрошенного (%d)\n"
- #: g10/trustdb.c:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "Можно попытаться пересоздать таблицу доверия командами:\n"
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr "Если это не выйдет, обратитесь к руководству пользователя\n"
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"не могу использовать неизвестную модель (%d) - использую модель доверия %s\n"
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "использую модель доверия %s\n"
@@@ -7182,7 -5745,6 +7256,7 @@@
msgid "no need for a trustdb check\n"
msgstr "проверка таблицы доверия не нужна\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "срок следующей проверки таблицы доверия %s\n"
@@@ -7205,25 -5763,20 +7279,23 @@@ msgstr "выполните --check-trus
msgid "checking the trustdb\n"
msgstr "проверка таблицы доверия\n"
+#: g10/trustdb.c:1850
- #, fuzzy, c-format
- #| msgid "%lu keys processed so far\n"
+ #, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
- msgstr[0] "обработано %lu ключей\n"
- msgstr[1] "обработано %lu ключей\n"
- msgstr[2] "обработано %lu ключей\n"
+ msgstr[0] "обработан %d ключ"
+ msgstr[1] "обработаны %d ключа"
+ msgstr[2] "обработано %d ключей"
+#: g10/trustdb.c:1853
- #, fuzzy, c-format
- #| msgid "%d keys processed (%d validity counts cleared)\n"
+ #, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] "обработано %d ключей (сброшено %d счетчиков достоверности)\n"
- msgstr[1] "обработано %d ключей (сброшено %d счетчиков достоверности)\n"
- msgstr[2] "обработано %d ключей (сброшено %d счетчиков достоверности)\n"
+ msgstr[0] " (сброшен %d счетчик достоверности)\n"
+ msgstr[1] " (сброшены %d счетчика достоверности)\n"
+ msgstr[2] " (сброшено %d счетчиков достоверности)\n"
+#: g10/trustdb.c:1923
msgid "no ultimately trusted keys found\n"
msgstr "абсолютно доверенных ключей не найдено\n"
@@@ -7232,7 -5784,6 +7304,7 @@@
msgid "public key of ultimately trusted key %s not found\n"
msgstr "открытый ключ для абсолютно доверенного ключа %s не найден\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7240,29 -5791,23 +7312,29 @@@ msgstr "
"глубина: %d достоверных: %3d подписанных: %3d доверие: %d-, %dq, %dn, "
"%dm, %df, %du\n"
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
"невозможно обновить запись о версии таблицы доверия: ошибка записи: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "неопределено"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "никогда"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "ограничено"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "полное"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "абсолютное"
@@@ -7274,39 -5819,30 +7346,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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "12 translator see trust.c:uid_trust_string_fixed"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ отозван ]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[ просрочен ]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ неизвестно ]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[неопределено]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[ ограничено ]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ полное ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ абсолютно ]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7316,12 -5852,10 +7388,12 @@@ msgstr "
"Файл подписи (.sig или .asc) должен быть\n"
"указан в командной строке первым.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "слишком длинная входная строка %u или пропущен перевод строки\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "не могу открыть fd %d: %s\n"
@@@ -7483,9 -5982,7 +7555,8 @@@ msgstr "ошибка получени�
msgid "card is permanently locked!\n"
msgstr "карта окончательно заблокирована!\n"
+#: scd/app-openpgp.c:1877
- #, fuzzy, c-format
- #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+ #, c-format
msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
msgid_plural ""
"%d Admin PIN attempts remaining before card is permanently locked\n"
@@@ -7593,16 -6068,13 +7664,15 @@@ msgstr "пожалуйста, подо�
msgid "generating key failed\n"
msgstr "сбой при генерации ключа\n"
+#: scd/app-openpgp.c:3596
- #, fuzzy, c-format
- #| msgid "key generation completed (%d seconds)\n"
+ #, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "создание ключа завершено (%d секунд)\n"
- msgstr[1] "создание ключа завершено (%d секунд)\n"
+ msgstr[0] "создание ключа завершено (%d секунда)\n"
+ msgstr[1] "создание ключа завершено (%d секунды)\n"
msgstr[2] "создание ключа завершено (%d секунд)\n"
+#: scd/app-openpgp.c:3661
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "недопустимая структура карты OpenPGP (DO 0x93)\n"
@@@ -7646,7 -6110,6 +7716,7 @@@ msgstr "|N|Первоначальны�
msgid "run in multi server mode (foreground)"
msgstr "работать в многосерверном режиме (нефоновый режим)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|установить уровень отладки, равный LEVEL"
@@@ -7784,9 -6217,6 +7854,9 @@@ msgstr "число соответств
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "ключ не найден в буфере dirmngr: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "сбой при выделении памяти под указатель на базу данных\n"
@@@ -8273,7 -6598,6 +8343,7 @@@ msgstr "(это не похоже на
msgid "certificate '%s' not found: %s\n"
msgstr "сертификат '%s' не найден: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "ошибка блокировки щита с ключами: %s\n"
@@@ -8297,123 -6617,93 +8367,123 @@@ msgstr "сбой при удалени�
msgid "no valid recipients given\n"
msgstr "не заданы получатели\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "вывести список внешних ключей"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "вывести список цепочек сертификатов"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "импорт сертификатов"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "экспорт сертификатов"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "зарегистрировать криптографическую карту"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "передать команду dirmngr"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "вызываем gpg-protect-tool"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "вывод в кодировке base64"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "предполагаю, что входные данные в формате PEM"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "предполагаю, что входные данные в формате base64"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "предполагаю, что входные данные в двоичном формате"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "не сверять со списком отозванных сертификатов"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "проверка достоверности с помощью OCSP"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|число включаемых сертификатов"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|FILE|взять информацию о правилах из файла FILE"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "не проверять правила сертификата"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "запросить недостающих издателей сертификатов"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "не использовать терминал совсем"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|сохранять журнал аудита в файле FILE"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "пакетный режим: ничего не спрашивать"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "принять 'да' как ответ на большинство вопросов"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "принять 'нет' как ответ на большинство вопросов"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FILE|добавить таблицу ключей в список таблиц ключей"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|использовать USER-ID как основной секретный ключ"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|искать ключи на данном сервере ключей"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|использовать алгоритм шифрования NAME"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|использовать хэш-функцию NAME"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Вызов: @GPGSM@ [параметры] [файлы] (-h для подсказки)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8424,46 -6714,37 +8494,46 @@@ msgstr "
"MIME\n"
"Операция по умолчанию зависит от входных данных\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "Замечание: не могу зашифровать для '%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "неизвестная схема проверки '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: не задано имя хоста\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: задан пароль, но не задан пользователь\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: пропускаю эту строку\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "не удалось определить сервер ключей\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "импорт общих сертификатов '%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "невозможно подписать с помощью '%s': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "недопустимая команда (неявной команды нет)\n"
@@@ -8480,7 -6758,6 +8550,7 @@@ msgstr "ошибка сохранени
msgid "basic certificate checks failed - not imported\n"
msgstr "ошибка базовой проверки сертификата - не импортирован\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "ошибка получения сохраненных признаков: %s\n"
@@@ -8495,31 -6770,25 +8565,31 @@@ msgstr "ошибка импорта с�
msgid "error reading input: %s\n"
msgstr "ошибка чтения ввода: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "сбой получения отпечатка\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "проблема поиска существующего сертификата: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "ошибка при поиске базы данных ключей для записи: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "ошибка сохранения сертификата: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "проблема повторного поиска сертификата: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "ошибка сохранения признаков: %s\n"
@@@ -8705,7 -6941,6 +8775,7 @@@ msgstr " постоянно заг
msgid " runtime cached certificates: %u\n"
msgstr "сертификатов в буфере времени исполнения: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
msgid "certificate already cached\n"
msgstr "сертификат уже в буфере\n"
@@@ -8713,8 -6947,6 +8783,8 @@@
msgid "certificate cached\n"
msgstr "сертификат в буфере\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, c-format
msgid "error caching certificate: %s\n"
msgstr "ошибка помещения сертификата в буфер: %s\n"
@@@ -9328,13 -7437,11 +9398,13 @@@ msgstr "рассматривать се
msgid "force the use of the default OCSP responder"
msgstr "принудительно использовать основной ответчик OCSP"
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
"Вызов: dirmngr-client [параметры] [файл_сертификата|шаблон] (-h для "
"подсказки)\n"
- #: dirmngr/dirmngr-client.c:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9346,77 -7453,61 +9416,77 @@@ msgstr "
"Процесс возвращает 0, если сертификат достоверен, 1, если недостоверен,\n"
"и другие коды ошибок при общих отказах\n"
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "ошибка чтения сертификата из stdin: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "ошибка чтения сертификата из %s: %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr "сертификат слишком велик, чтобы иметь какой-то смысл\n"
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, c-format
msgid "can't connect to the dirmngr: %s\n"
msgstr "не могу подключиться к dirmngr: %s\n"
- #: dirmngr/dirmngr-client.c:327
++#: dirmngr/dirmngr-client.c:333
#, c-format
msgid "lookup failed: %s\n"
msgstr "сбой при поиске: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "сбой при загрузке списка отозванных сертификатов '%s': %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr "демон dirmngr работает\n"
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "сбой при проверке сертификата: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
msgid "certificate is valid\n"
msgstr "сертификат достоверен\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
msgid "certificate has been revoked\n"
msgstr "сертификат был отозван\n"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, c-format
msgid "certificate check failed: %s\n"
msgstr "сбой при проверке сертификата: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr "получен статус: '%s'\n"
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "ошибка записи в кодировке base64: %s\n"
- #: dirmngr/dirmngr-client.c:685
++#: dirmngr/dirmngr-client.c:702
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "запрос '%s' не поддерживается\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr "нужно абсолютное имя файла\n"
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr "поиск '%s'\n"
@@@ -9568,12 -7625,10 +9638,12 @@@ msgstr "вызов: %s [парамет�
msgid "colons are not allowed in the socket name\n"
msgstr "двоеточия в имени сокета недопустимы\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
@@@ -10048,76 -8001,60 +10118,76 @@@ msgstr "ответчик OCSP возв�
msgid "OCSP responder returned an too old status\n"
msgstr "ответчик OCSP возвратил слишком старый статус\n"
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "сбой assuan_inquire(%s): %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr "нет сервера LDAP"
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr "в ID сертификата нет серийного номера"
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "сбой assuan_inquire: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "сбой fetch_cert_by_url: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, c-format
msgid "error sending data: %s\n"
msgstr "ошибка отправки данных: %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "сбой start_cert_fetch: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "сбой fetch_next_cert: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "превышено max_replies %d\n"
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "сбой размещения контекста Assuan: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "сбой инициализации сервера: %s\n"
- #: dirmngr/server.c:2438
++#: dirmngr/server.c:2437
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "сбой регистрации команд с помощью Assuan: %s\n"
- #: dirmngr/server.c:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема с приемом Assuan: %s\n"
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "сбой обработки Assuan: %s\n"
@@@ -10316,13 -8205,9 +10386,11 @@@ msgstr "|N|считать фразу-п
msgid "do not allow the reuse of old passphrases"
msgstr "не разрешать повторное использование старых фраз-паролей"
+#: tools/gpgconf-comp.c:587
- #, fuzzy
- #| msgid "|N|set LDAP timeout to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
- msgstr "|N|установить время ожидания LDAP N секунд"
+ msgstr "|N|установить время ожидания ввода PIN N секунд"
+#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|использовать NAME как основной секретный ключ"
diff --cc po/sk.po
index b0bc4a1,3bf2c2b..1a32a7e
--- a/po/sk.po
+++ b/po/sk.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer at econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@@ -101,8 -85,6 +101,8 @@@ msgstr "Pros�m, vlo�te heslo; toto je t
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "nespr�vne heslo"
@@@ -158,25 -129,11 +158,25 @@@ msgstr "nespr�vne heslo
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -385,8 -303,6 +385,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "zmeni� heslo"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -396,118 -312,87 +396,118 @@@ msgstr "
"Mo�nosti:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "s dodato�n�mi inform�ciami"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "by� o trochu tich��"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "vyh�ada� k���e na serveri k���ov"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualizova� datab�zu d�very"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nepodporovan�"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -516,166 -401,126 +516,171 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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 ""
"Chyby ozn�mte, pros�m, na adresu <gnupg-bugs at gnu.org>.\n"
"Pripomienky k prekladu <sk-i18n at lists.linux.sk>.\n"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
#, 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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
msgid "directory '%s' created\n"
msgstr "%s: adres�r vytvoren�\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, 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:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: presko�en�: %s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -691,8 -534,6 +696,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -700,9 -541,6 +705,9 @@@ msgstr "
"@Pr�kazy:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -712,46 -550,38 +717,46 @@@ msgstr "
"Mo�nosti:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "Zru�i�"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
@@@ -815,8 -635,6 +820,8 @@@ msgstr "
msgid "Yes"
msgstr "ano"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -846,46 -661,38 +851,46 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "zmeni� heslo"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
msgid "Delete key"
msgstr "nastavi� k��� ako platn� (enable)"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr ""
@@@ -926,53 -726,42 +931,57 @@@ msgstr "ochrann� algoritmus %d%s nie j
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
msgid "error creating a stream for a pipe: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "chyba pri ��tan� `%s': %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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "aktualiz�cia zlyhala: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -987,17 -774,18 +996,22 @@@ msgstr "probl�m v komunik�cii s gpg-age
msgid "problem setting the gpg-agent options\n"
msgstr "probl�m s agentom: agent vracia 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "zru�en� u��vate�om\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "probl�m s agentom: agent vracia 0x%lx\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "probl�m s agentom: agent vracia 0x%lx\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nem�em vypn�� vytv�ranie core s�borov: %s\n"
@@@ -1068,17 -842,18 +1082,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 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"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1406,7 -1114,6 +1425,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "nespracovan�"
@@@ -1416,22 -1122,14 +1435,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "neplatn� parameter pre import\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "n�jden� chyba v programe ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "nemo�no otvori� s�bor: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
@@@ -1470,89 -1161,75 +1484,95 @@@ msgstr "verejn� k��� %08lX nebol n�jden
msgid "waiting for lock %s...\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "ASCII k�dovanie: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "neplatn� hlavi�ka ASCII k�dovania: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "ASCII hlavi�ka: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "ASCII hlavi�ka: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "vnoren� podpisy v �itate�nom form�tu\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
#, fuzzy
msgid "unexpected armor: "
msgstr "neo�ak�van� k�dovanie ASCII:"
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "nespr�vne ozna�enie riadku m�nusmi: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "pred�asn� koniec s�boru (v CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "nespr�vny form�t CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Chyba CRC; %06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "chyba v p�ti�ke\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"neplatn� znak (quoted-printable) v ASCII k�dovan� - pravdepodobne bol "
"pou�it� nespr�vny MTA\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "nie je v priamo �itate�nom form�te"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1560,84 -1237,73 +1580,95 @@@ msgstr "
"meno m�e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
"kon�i� s '='\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "hodnota mus� obsahova� znak '@'\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "hodnota mus� obsahova� znak '@'\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "hodnota mus� obsahova� znak '@'\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "meno m�e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
+ "kon�i� s '='\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "nie je v priamo �itate�nom form�te"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Vlo�te heslo: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "VAROVANIE: %s prep�e %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "nemo�no previes� v d�vkovom m�de\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "V� v�ber? "
@@@ -1704,21 -1356,11 +1735,16 @@@ msgstr "�iadny zodpovedaj�ci verejn� k�
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: 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"
@@@ -1816,13 -1439,10 +1842,13 @@@ msgstr "Ak� ve�kos� k���a si prajete? (
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Ak� ve�kos� k���a si prajete? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: 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:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1877,9 -1487,6 +1903,9 @@@ msgstr " (%d) RSA (len na �ifrovanie)
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Neplatn� v�ber.\n"
@@@ -1913,7 -1514,6 +1939,7 @@@ msgstr "Skuto�ne podp�sa�?
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "ukon�i� toto menu"
@@@ -1922,7 -1521,6 +1948,7 @@@
msgid "show admin commands"
msgstr "konfliktn� pr�kazy\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "uk�za� t�to pomoc"
@@@ -2006,131 -1586,101 +2032,131 @@@ msgstr "konfliktn� pr�kazy\n
msgid "Admin commands are not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output pre tento pr�kaz nefunguje\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nemo�no otvori� `%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba pri ��tan� bloku k���a: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(pokia� neur��te k��� jeho fingerprintom)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
#, 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:149
++#: g10/delkey.c:148
#, fuzzy
msgid "Delete this key from the keyring? (y/N) "
msgstr "Zmaza� tento k��� zo s�boru k���ov? "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
#, fuzzy
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Toto je tajn� k���! - skuto�ne zmaza�? "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "key"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Verejn� k���e: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "inform�cie o d�veryhodnosti vlastn�ka k���a vymazan�\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "v m�de S2K nemo�no pou�i� symetrick� ESK paket\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "pou�it� �ifra %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' je u� skomprimovan�\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "��tam z `%s'\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, fuzzy, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2138,40 -1688,33 +2164,40 @@@
msgstr ""
"vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
++#: g10/encrypt.c:904
+ #, c-format
+ msgid "%s/%s encrypted for: \"%s\"\n"
+ msgstr "%s/%s za�ifrovan� pre: %s\n"
+
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr ""
"pou�itie %s nie je v m�de %s dovolen�\n"
"\n"
- #: g10/encrypt.c:910
- #, c-format
- msgid "%s/%s encrypted for: \"%s\"\n"
- msgstr "%s/%s za�ifrovan� pre: %s\n"
-
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s za�ifrovan� d�ta\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"VAROVANIE: spr�va bola za�ifrovan� slab�m k���om v symetrickej �ifre.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "probl�m so za�ifrovan�m paketom\n"
@@@ -2232,140 -1764,112 +2258,140 @@@ 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:79
++#: g10/export.c:78
#, 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:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:83
++#: g10/export.c:82
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
- #: g10/export.c:85
++#: g10/export.c:84
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "nepou�ite�n� tajn� k���"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: presko�en�: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, 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:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "chyba pri vytv�ran� `%s': %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
#, fuzzy
msgid "[User ID not found]"
msgstr "[User id not found]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "chyba pri vytv�ran� `%s': %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "chyba pri vytv�ran� `%s': %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "vyp�sa� fingerprint"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
# c-format
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
@@@ -2375,11 -1878,9 +2401,11 @@@
msgid "make a clear text signature"
msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "�ifrova� d�ta"
@@@ -2387,15 -1887,12 +2413,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "�ifrovanie len so symetrickou �ifrou"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "de�ifrova� d�ta (implicitne)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifikova� podpis"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "vyp�sa� zoznam k���ov"
@@@ -2408,15 -1903,12 +2434,15 @@@ msgstr "vyp�sa� zoznam k���ov a podpiso
msgid "list and check key signatures"
msgstr "skontrolova� podpisy k���ov"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "vyp�sa� zoznam k���ov a fingerprintov"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "vyp�sa� zoznam tajn�ch k���ov"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "vytvori� nov� p�r k���ov"
@@@ -2440,7 -1928,6 +2466,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "vytvori� revoka�n� certifik�t"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
@@@ -2472,7 -1953,6 +2498,7 @@@ msgstr "podp�sa� k��� lok�lne
msgid "sign or edit a key"
msgstr "podp�sa� alebo modifikova� k���"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "zmeni� heslo"
@@@ -2522,24 -1991,19 +2548,24 @@@ msgstr "aktualizova� datab�zu d�very
msgid "print message digests"
msgstr "|algo [s�bory]|vyp� hash"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|MENO|�ifrova� pre MENO"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
@@@ -2557,12 -2019,10 +2583,12 @@@ msgstr "
msgid "use canonical text mode"
msgstr "pou�i� k�nonick� textov� m�d"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "nevykona� �iadne zmeny"
@@@ -2574,7 -2032,6 +2600,7 @@@ msgstr "vy�iada� potvrdenie pred prep�s
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2583,7 -2040,6 +2609,7 @@@ msgstr "
"(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
"mo�nost�)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2603,13 -2059,11 +2629,13 @@@ msgstr "
" --list-keys [men�] vyp�sa� k���e\n"
" --fingerprint [men�] vyp�sa� fingerprinty\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2624,7 -2078,6 +2650,7 @@@ msgstr "
"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2632,607 -2085,478 +2658,607 @@@ msgstr "
"\n"
"Podporovan� algoritmy:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Verejn� k���e: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "�ifry: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Kompresia: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "pou�itie: gpg [mo�nosti] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "konfliktn� pr�kazy\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, 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:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, 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:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, 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:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
#, 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:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
#, 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:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "nastavi� k��� ako neplatn� (disable)"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
#, 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:2994
++#: g10/gpg.c:3001
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nemo�no nastavi� exec-path na %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program m�e vytvori� s�bor core!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVANIE: %s prep�e %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�va s %s zmysel!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
#, 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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� predvo�by\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s e�te nepracuje s %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [meno s�boru]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [meno s�boru]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "de�ifrovanie zlyhalo: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [meno s�boru]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [meno s�boru]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [meno s�boru]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [meno s�boru]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [meno s�boru]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key id u��vate�a"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key id u��vate�a"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u��vate�a [pr�kazy]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id u��vate�a"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nepodarilo posla� k��� na server: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "nepodaril sa export k���a: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "nepodaril sa export k���a: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nepodarilo sa n�js� server: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aktualiz�cia servera zlyhala: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[meno s�boru]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Za�nite p�sa� svoju spr�vu ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@@ -3246,7 -2568,6 +3272,7 @@@ msgstr "Zmaza� tento k��� zo s�boru k��
msgid "make timestamp conflicts only a warning"
msgstr "konflikt �asov�ho raz�tka"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
@@@ -3273,328 -2590,262 +3299,328 @@@ msgstr "Pomoc nie je k dispoz�cii
msgid "No help available for '%s'"
msgstr "Pomoc nie je dostupn� pre '%s'"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aktualizova� datab�zu d�very"
- #: g10/import.c:114
++#: g10/import.c:113
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aktualizova� datab�zu d�very"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:120
++#: g10/import.c:119
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "nepou�ite�n� tajn� k���"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d bol presko�en�\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu k���e boli doteraz spracovan�\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Celkovo spracovan�ch k���ov: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " presko�en� nov� k���e: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " presko�en� nov� k���e: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identifik�torov: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importovan�: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmien: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nov� id u��vate�ov: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nov� podk���e: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " nov� podpisy: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nov� revok�cie k���ov: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " pre��tan� tajn� k���e: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importovan� tajn� k���e: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajn� k���e nezmenen�: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " neimportovan�: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nov� podpisy: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " pre��tan� tajn� k���e: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:867
++#: g10/import.c:866
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s podpis, hashovac� algoritmus %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "presko�en� `%s': %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
# c-format
- #: g10/import.c:1036
++#: g10/import.c:1035
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "k��� %08lX: nov� k��� - presko�en�\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, 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:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, 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:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "k��� %08lX: \"%s\" bez zmeny\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "k��� %08lX: tajn� k��� importovan�\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3609,202 -2860,180 +3635,222 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, 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:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, 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:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, 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:2182
++#: g10/import.c:2181
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "k��� %08lX: podk��� presko�en�\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, 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"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "chyba pri vytv�ran� `%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[revok�cia]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[podpis k���a n�m sam�m]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d zl�ch podpisov\n"
- msgstr[1] "%d zl�ch podpisov\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "%s podpis, hashovac� algoritmus %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "Dobr� podpis od \""
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ msgid "key %s:\n"
+ msgstr "presko�en� `%s': %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "U��vate�sk� ID \"%s\" je revokovan�."
+ msgstr[1] "U��vate�sk� ID \"%s\" je revokovan�."
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3812,25 -3041,25 +3858,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 podpis neoveren�, preto�e ch�ba k���\n"
msgstr[1] "1 podpis neoveren�, preto�e ch�ba k���\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 podpis neoveren�, preto�e vznikla chyba\n"
- msgstr[1] "1 podpis neoveren�, preto�e vznikla chyba\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d zl�ch podpisov\n"
+ msgstr[1] "%d zl�ch podpisov\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] ""
- "zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
- msgstr[1] ""
- "zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Dobr� podpis od \""
+ msgstr[1] "Dobr� podpis od \""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
+
++#: g10/keyedit.c:974 g10/pkclist.c:275
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3843,68 -3072,53 +3893,68 @@@ msgstr "
"kontrolou fingerprintov z r�znych zdrojov...)?\n"
"\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = D�verujem �iasto�ne\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = D�verujem �plne\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
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:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Nemo�no podp�sa�.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, 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:722
++#: g10/keyedit.c:1235
#, 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:724
++#: g10/keyedit.c:1237
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Skuto�ne podp�sa�? "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3913,11 -3127,9 +3963,11 @@@ msgstr "
"Podpis k���a \"%s\" n�m sam�m je\n"
"podpis vo form�te PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3927,11 -3139,9 +3977,11 @@@ msgstr "
"je len lok�lny.\n"
"\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3941,43 -3151,34 +3991,43 @@@ msgstr "
"je len lok�lny.\n"
"\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, 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:833
++#: g10/keyedit.c:1346
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:855
++#: g10/keyedit.c:1368
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Ni� na podp�sanie k���om %08lX\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Platnos� k���a vypr�ala!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Platnos� k���a vypr�� %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3987,32 -3188,26 +4037,32 @@@ msgstr "
"patr� vy��ie uvedenej osobe?\n"
"Pokia� nepozn�te odpove�, zadajte \"0\".\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Neodpoviem.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, 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:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) �iasto�ne som to overil(a).%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "V� v�ber? ('?' - viac inform�ci�): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4021,28 -3216,24 +4071,28 @@@ msgstr "
"Ste si ist�, �e chcete podp�sa� tento k���\n"
"svoj�m k���om: \""
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ide o podpis k���a n�m sam�m\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
#, 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:1010
++#: g10/keyedit.c:1523
#, 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:1020
++#: g10/keyedit.c:1533
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
@@@ -4050,241 -3241,187 +4100,237 @@@
"Podpis bude ozna�en� ako neexportovate�n�.\n"
"\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
#, 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:1034
++#: g10/keyedit.c:1547
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"V�bec som tento k��� neoveril.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"�iasto�ne som overil tento k���.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Velmi d�kladne som overil tento k���.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Skuto�ne podp�sa�? "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "pres�vam podpis k���a na spr�vne miesto\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "ulo�i� a ukon�i�"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
#, fuzzy
msgid "show key fingerprint"
msgstr "vyp�sa� fingerprint"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Podpisov� not�cia: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "vyberte identifik�tor u��vate�a N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
#, fuzzy
msgid "select subkey N"
msgstr "vyberte identifik�tor u��vate�a N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
#, fuzzy
msgid "check signatures"
msgstr "revokova� podpisy"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "podp�sa� k��� lok�lne"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
#, 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:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "prida� identifik�tor u��vate�a"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "prida� fotografick� ID"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
#, fuzzy
msgid "delete selected user IDs"
msgstr "zmaza� identifik�tor u��vate�a"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
#, fuzzy
msgid "delete selected subkeys"
msgstr "zmaza� sekund�rny k���"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "prida� revoka�n� k���"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
#, 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:1432
++#: g10/keyedit.c:1898
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "vyp�sa� zoznam predvolieb (podrobne)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
#, 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:1441
++#: g10/keyedit.c:1907
#, 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:1443
++#: g10/keyedit.c:1909
#, 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:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "zmeni� heslo"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revokova� identifik�tor u��vate�a"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revokova� sekund�rny k���"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
#, fuzzy
msgid "enable key"
msgstr "nastavi� k��� ako platn� (enable)"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
#, fuzzy
msgid "disable key"
msgstr "nastavi� k��� ako neplatn� (disable)"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
#, fuzzy
msgid "show selected photo IDs"
msgstr "uk�za� fotografick� ID"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Tajn� k��� je dostupn�.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4292,267 -3429,215 +4338,273 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "K��� revokovan�."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "nezn�ma trieda podpisu"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Nem�ete zmaza� posledn� id u��vate�a!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
#, 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:1854
++#: g10/keyedit.c:2320
#, 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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Mus�te vybra� aspo� jeden k���.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "nem�em otvori� `%s': %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Mus�te vybra� aspo� jeden k���.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Skuto�ne chcete zmaza� tento k���? "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Skuto�ne revokova� toto id u��vate�a? "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Skuto�ne chcete revokova� tento k���? "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Skuto�ne chcete revokova� vybran� k���e? "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Skuto�ne chcete revokova� tento k���? "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
#, fuzzy
msgid "Set preference list to:\n"
msgstr "nastavi� zoznam predvolieb"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
#, 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:2204
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Skuto�ne aktualizova� predvo�by? "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Ulo�i� zmeny? "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Ukon�i� bez ulo�enia? "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "chyba: neplatn� odtla�ok\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "neplatn� hodnota\n"
+
++#: g10/keyedit.c:3099
#, 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:2580
++#: g10/keyedit.c:3099
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Ni� na podp�sanie k���om %08lX\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Charakteristiky: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
#, fuzzy
msgid "Notations: "
msgstr "Not�cie: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
#, fuzzy
msgid "(sensitive)"
msgstr "(citliv� inform�cia)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s: nem�em vytvori�: %s\n"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revokovan�]"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [platnos� skon��: %s]"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [platnos� skon��: %s]"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, fuzzy, c-format
msgid "usage: %s"
msgstr " d�vera: %c/%c"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, fuzzy, c-format
msgid "trust: %s"
msgstr " d�vera: %c/%c"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4560,19 -3645,14 +4612,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revokovan�]"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4580,17 -3660,14 +4632,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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4599,35 -3676,27 +4651,35 @@@ msgstr "
"VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m�e v niektor�ch\n"
" verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4635,38 -3704,31 +4687,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Zmazan� %d podpis.\n"
msgstr[1] "Zmazan� %d podpis.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Ni� nebolo zmaznan�.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
#, fuzzy
msgid "invalid"
msgstr "neplatn� sp�sob reprezent�cie v ASCII"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "U��vate�sk� ID \"%s\" je revokovan�."
msgstr[1] "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4675,273 -3737,215 +4727,273 @@@ 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:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
#, 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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
#, 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:4018
++#: g10/keyedit.c:4536
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, 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:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
#, 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:4557
++#: g10/keyedit.c:5181
#, 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:4616
++#: g10/keyedit.c:5240
#, fuzzy
msgid "Enter the notation: "
msgstr "Podpisov� not�cia: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Prep�sa� (a/N)? "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, 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:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "id u��vate�a: \""
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (nexeportovate�n�)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnos� podpisu vypr�� %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
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:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
#, fuzzy
msgid "Not signed by you.\n"
msgstr " podp�san� %08lX v %s%s\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
#, fuzzy
msgid " (non-revocable)"
msgstr " (nexeportovate�n�)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revokovan� %08lX v %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Chyst�te sa revokova� tieto podpisy:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "neexistuje tajn� k���\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Zobrazujem %s fotografick� ID s ve�kos�ou %ld pre k��� 0x%08lX (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
msgid "preference '%s' duplicated\n"
msgstr "duplicita predvo�by %c%lu\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "pr�li� ve�a `%c' predvolieb\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
#, fuzzy
msgid "too many digest preferences\n"
msgstr "pr�li� ve�a `%c' predvolieb\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
#, fuzzy
msgid "too many compression preferences\n"
msgstr "pr�li� ve�a `%c' predvolieb\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "neplatn� znak v re�azci s predvo�bami\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "zapisujem podpis k���a sebou sam�m\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "zapisujem \"key-binding\" podpis\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
#, fuzzy
msgid "Encrypt"
msgstr "�ifrova� d�ta"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr ""
@@@ -4955,157 -3959,126 +5007,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (len na �ifrovanie)\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA a ElGamal (implicitn�)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA a ElGamal (implicitn�)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (len na podpis)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (len na podpis)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (len na �ifrovanie)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (len na �ifrovanie)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (len na �ifrovanie)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (len na �ifrovanie)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA a ElGamal (implicitn�)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (len na podpis)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (len na �ifrovanie)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (len na �ifrovanie)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (len na �ifrovanie)\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Podpisov� not�cia: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Ak� ve�kos� k���a si prajete? (1024) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Ak� ve�kos� k���a si prajete? (1024) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "zaokr�hlen� na %u bitov\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5121,7 -4094,6 +5173,7 @@@ msgstr "
" <n>m = doba platnosti k���a skon�� za n mesiacov\n"
" <n>y = doba platnosti k���a skon�� za n rokov\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5137,40 -4109,32 +5189,40 @@@ msgstr "
" <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
" <n>y = doba platnosti podpisu skon�� za n rokov\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "K��� je platn� na? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Podpis je platn� na? (0) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "neplatn� hodnota\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "platnos� %s neskon��\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "platnos� %s neskon��\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "platnos� %s skon�� %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Platnos� podpisu vypr�� %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5178,12 -4142,10 +5230,12 @@@ msgstr "
"V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
"V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Je to spr�vne (a/n)? "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5194,7 -4156,6 +5246,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
#, fuzzy
msgid ""
"\n"
@@@ -5211,50 -4172,39 +5263,50 @@@ msgstr "
" \"Jozko Mrkvicka (student) <jozko at mrkvicka.sk>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Meno a priezvisko: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Neplatn� znak ve mene\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Meno nem�e za��na� ��slicou\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "E-mailov� adresa: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Neplatn� e-mailov� adresa\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Koment�r: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Neplatn� znak v koment�ri\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5265,7 -4215,6 +5317,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5280,35 -4229,28 +5332,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "mMkKeEPpUu"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Najsk�r, pros�m, opravte chybu\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5320,12 -4262,10 +5372,12 @@@ msgstr "
"pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
"entropie.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5333,66 -4273,53 +5385,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' je u� skomprimovan�\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Pou�i� napriek tomu tento k���? "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
msgid "creating anyway\n"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Vytv�ranie k���a bolo zru�en�.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, 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:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5401,7 -4328,6 +5453,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:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5409,7 -4335,6 +5461,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:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5417,51 -4342,40 +5469,51 @@@ msgstr "
"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
"je probl�m so syst�mov�m �asom)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
#, 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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Skuto�ne vytvori�? "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "nikdy "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Kritick� podpisov� politika: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Podpisov� politika: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Kritick� podpisov� not�cia: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Podpisov� not�cia: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5469,69 -4383,63 +5521,77 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d zl�ch podpisov\n"
msgstr[1] "%d zl�ch podpisov\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 podpis neoveren�, preto�e vznikla chyba\n"
+ msgstr[1] "1 podpis neoveren�, preto�e vznikla chyba\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "s�bor k���ov (keyring)"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, fuzzy, c-format
msgid "skipped \"%s\": %s\n"
msgstr "presko�en� `%s': %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Prim�rny fingerprint k���a:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " Prim�rny fingerprint k���a:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Fingerprint podk���a:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint k���a ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr ""
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
msgid "caching keyring '%s'\n"
msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
msgstr[1] "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5539,532 -4447,425 +5599,532 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 zl� podpis\n"
msgstr[1] "1 zl� podpis\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr ""
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr ""
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "po�adujem k��� %08lX z %s\n"
msgstr[1] "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
msgid "no keyserver known\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, 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:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROVANIE: nem�em vymaza� do�asn� s�bor (%s) `%s': %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "zvl�tna ve�kos� �ifrovacieho k���a pre sedenie (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s k��� �ifrovan�ho sedenia\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "verejn� k��� je %08lX\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "za�ifrovan� %u-bitov�m %s k���om, ID %08lX, vytvoren�m %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
# [kw]
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "za�ifrovan� %s k���om, ID %08lX\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "za�ifrovan� s %lu heslami\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "za�ifrovan� jedn�m heslom\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"algoritmus IDEA nie je dostupn�; optimisticky sa ho pok�sime nahradi� "
"algoritmom %s\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "de�ifrovanie o.k.\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "de�ifrovanie zlyhalo: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "p�vodn� meno s�boru='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
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:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
#, fuzzy
msgid "no signature found\n"
msgstr "Dobr� podpis od \""
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ZL� podpis od \""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypr�anou platnos�ou od \""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Dobr� podpis od \""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "verifik�cia podpisu potla�en�\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Platnos� podpisu vypr�ala %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, 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:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "K��� k dispoz�cii na: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[neist�] "
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnos� podpisu vypr�ala %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnos� podpisu vypr�� %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "bin�rne"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "textov� m�d"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "nezn�me"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "nezn�my algoritmus verejn�ho k���a"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nem�em overi� podpis: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "toto nie je podpis oddelen� od dokumentu\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatn� podpis triedy 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis star�ho typu (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, fuzzy, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "nemo�no otvori� s�bor: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, 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:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
#, 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:302
++#: g10/misc.c:300
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "�ifrovac� algoritmus nie je implementovan�"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s podpis, hashovac� algoritmus %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, 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:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "chyba pri ��tan�: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
msgid "(reported error: %s <%s>)\n"
msgstr "chyba pri ��tan�: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "pou�ite namiesto neho \"%s%s\" \n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Nekomprimovan�"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
#, fuzzy
msgid "uncompressed|none"
msgstr "Nekomprimovan�"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
msgid "ambiguous option '%s'\n"
msgstr "��tam mo�nosti z `%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
msgid "unknown option '%s'\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
msgid "unknown weak digest '%s'\n"
msgstr "nezn�ma trieda podpisu"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "S�bor `%s' existuje. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
#, fuzzy
msgid "Overwrite? (y/N) "
msgstr "Prep�sa� (a/N)? "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: nezn�ma pr�pona\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Vlo�te nov� n�zov s�boru"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "zapisujem na �tandardn� v�stup (stdout)\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "predpoklad�m podp�san� d�ta v `%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "vytvoren� nov� konfigura�n� s�bor `%s'\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nem�em pracova� s algoritmom verejn�ho k���a %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "probl�m s agentom: agent vracia 0x%lx\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (hlavn� ID k���a %08lX)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6077,15 -4878,12 +6137,15 @@@ msgstr "
"\"%.*s\"\n"
"k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Vlo�i� heslo\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "zru�en� u��vate�om\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6095,47 -4893,38 +6155,47 @@@ msgstr "
"Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
"u��vate�a: \""
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
msgid ""
"%s\n"
@@@ -6192,31 -4973,24 +6252,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "D�vod nebol �pecifikovan�"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "K��� je nahraden�"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "K��� bol skompromitovan�"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "K��� sa u� nepou��va"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "Identifik�tor u��vate�a u� neplat�"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "d�vod na revok�ciu: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "revoka�n� pozn�mka: "
@@@ -6230,100 -5004,81 +6290,100 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMuUsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
#, 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:259
++#: g10/pkclist.c:258
#, fuzzy, c-format
msgid " aka \"%s\"\n"
msgstr " alias \""
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
#, 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:284
++#: g10/pkclist.c:283
#, fuzzy, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Neviem\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, fuzzy, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Ned�verujem\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, fuzzy, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = D�verujem absol�tne\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
#, fuzzy
msgid " m = back to the main menu\n"
msgstr " m = sp� do hlavn�ho menu\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
#, fuzzy
msgid " s = skip this key\n"
msgstr " s = presko�i� tento k���\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
#, fuzzy
msgid " q = quit\n"
msgstr " u = ukon�i�\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Va�e rozhodnutie? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
#, 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:347
++#: g10/pkclist.c:346
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:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
#, fuzzy
msgid "This key probably belongs to the named user\n"
msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Tento k��� patr� n�m (m�me zodpovedaj�ci tajn� k���)\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
#, fuzzy
msgid ""
"It is NOT certain that the key belongs to the person named\n"
@@@ -6335,132 -5090,104 +6395,132 @@@ msgstr "
"odpoveda� �no\n"
"\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
#, fuzzy
msgid "Use this key anyway? (y/N) "
msgstr "Pou�i� napriek tomu tento k���? "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "VAROVANIE: Je pou�it� ned�veryhodn� k���!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
#, 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:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr ""
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr ""
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr ""
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr ""
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Tento podpis je pravdepodobne FALO�N�.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: presko�en�: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, 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:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "nem�em sa pripoji� k `%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6468,167 -5195,131 +6528,167 @@@ msgstr "
"\n"
"Nap�te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Verejn� k��� je neplatn� (disabled).\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "�iadne platn� adresy\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, 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:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Podpis oddelen� od dokumentu.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "��tam �tandardn� vstup (stdin) ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "ch�baj� podp�san� d�ta\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nem�em otvori� podp�san� d�ta '%s'\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, fuzzy, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonymn� adres�t; sk��am tajn� k��� %08lX ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "o.k., my sme anonymn� adres�t.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "star� k�dovanie DEK nie je podporov�n�\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "�ifrovac� algoritmus %d%s je neznam� alebo je zak�zan�\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, fuzzy, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "POZN�MKA: v predvo�b�ch nen�jden� �ifrovac� algoritmus %d\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet zlyhala: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, fuzzy, c-format
msgid "key %s has no user IDs\n"
msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Bude revokovan�:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Toto je citliv� revoka�n� k���)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "Tajn� k��� je dostupn�.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
#, fuzzy
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "Vyn�ten� ASCII textov� v�stup.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet zlyhala: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, 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:552
++#: g10/revoke.c:551
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6637,20 -5328,17 +6697,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
@@@ -6658,23 -5346,19 +6718,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6692,93 -5376,75 +6752,93 @@@ 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:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Zru�i�"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "D�vod na revok�ciu: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(�iadny popis)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Je to v poriadku? "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "vytvoren� slab� k��� - sk��am znovu\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"nem�em sa vyvarova� slab�ho k���a pre symetrick� �ifru; oper�ciu som sk�sil "
"%d kr�t!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr ""
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "VAROVANIE: konflikt hashu podpisu v spr�ve\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, 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:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
msgstr[1] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
msgstr[1] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6791,7 -5457,6 +6851,7 @@@ msgstr[1] "
"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
"je probl�m so syst�mov�m �asom)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6803,41 -5468,34 +6863,41 @@@ msgstr[1] "
"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
"je probl�m so syst�mov�m �asom)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "POZN�MKA: k��� bol revokovan�"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, fuzzy, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"VAROVANIE: nemo�no %%-expandova� not�cie (pr�li� dlh�). Pou�it� "
"neexpandovan�.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6845,7 -5503,6 +6905,7 @@@ msgstr "
"VAROVANIE: nem�em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
"neexpandovan�.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, fuzzy, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6854,55 -5511,45 +6914,55 @@@ msgstr "
"VAROVANIE: nem�em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
"neexpandovan�.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s podpis od: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "podpisujem:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude pou�it� �ifrovanie %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"k��� nie je ozna�en� ako nedostato�ne bezpe�n� - nem�em ho pou�i� s "
"falo�n�m RNG!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, fuzzy, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "presko�en� `%s': duplikovan�\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
#, 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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, 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"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6911,342 -5558,276 +6971,342 @@@ msgstr "
"# Zoznam pridelen�ch hodn�t d�veryhodnosti, vytvoren� %s\n"
"# (Pou�ite \"gpg --import-ownertrust\" na obnovenie)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
msgid "error in '%s': %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
#, fuzzy
msgid "line too long"
msgstr "riadok je pr�li� dlh�\n"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ""
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
#, fuzzy
msgid "invalid fingerprint"
msgstr "chyba: neplatn� odtla�ok\n"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
#, fuzzy
msgid "ownertrust value missing"
msgstr ""
"importova� hodnoty d�veryhodnosti\n"
" vlastn�ka k���a"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "chyba pri h�adan� z�znamu d�very: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
msgid "read error in '%s': %s\n"
msgstr "chyba pri ��tan�: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "nemo�no otvori� `%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "z�znam v datab�ze d�very %lu: lseek() sa nepodaril: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "z�znam v datab�ze d�very %lu: z�pis sa nepodaril (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
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:606
- #, fuzzy, c-format
- msgid "can't access '%s': %s\n"
- msgstr "nem�em zavrie� `%s': %s\n"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: adres�r neexistuje!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, fuzzy, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "nem�em zavrie� `%s': %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: nepodarilo sa vytvori� z�znam verzie: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: vytvoren� neplatn� datab�za d�very\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: datab�za d�very vytvoren�\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "POZN�MKA: do trustdb nemo�no zapisova�\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: neplatn� datab�ze d�very\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: nie je s�bor datab�zy d�very\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: z�znam verzie s ��slom %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: neplatn� verzia s�boru %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: datab�za d�very vytvoren�\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "nem�em pracova� s riadkami dlh��mi ako %d znakov\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"Podporovan� algoritmy:\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
msgid "error gathering other user IDs: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "Policy: "
msgid "policy: %s"
msgstr "Politika: "
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "vyp�sa� zoznam k���ov"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|algo [s�bory]|vyp� hash"
msgstr[1] "|algo [s�bory]|vyp� hash"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7256,174 -5837,154 +7316,185 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|algo [s�bory]|vyp� hash"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, fuzzy, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "k��� %08lX: akceptovan� ako d�veryhodn� k���\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, fuzzy, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "k��� ozna�en� ako absol�tne d�veryhodn�.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr ""
@@@ -7432,7 -5992,6 +7503,7 @@@
msgid "no need for a trustdb check\n"
msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "dal�ia kontrola datab�zy d�very %s\n"
@@@ -7479,35 -6030,28 +7550,35 @@@ msgstr "neboli n�jden� �iadne absol�tn
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, 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"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
#, fuzzy
msgid "never"
msgstr "nikdy "
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7519,42 -6063,33 +7590,42 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
msgid "[ revoked]"
msgstr "[revokovan�]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
msgid "[ expired]"
msgstr "[expirovan�]"
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
msgid "[ unknown]"
msgstr "nezn�me"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7564,12 -6099,10 +7635,12 @@@ msgstr "
"Pros�m, nezab�dajte, �e s�bor s podpisom (.sig alebo .asc)\n"
"by mal by� prv�m s�borom zadan�m na pr�kazovom riadku.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "vstupn� riadok %u je pr�li� dlh� alebo na konci ch�ba znak LF\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "nem�em otvori� `%s': %s\n"
@@@ -7898,7 -6363,6 +7969,7 @@@ msgstr "
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -8043,9 -6477,6 +8114,9 @@@ msgstr "chyba pri vytv�ran� hesla: %s\n
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
@@@ -8553,7 -6879,6 +8624,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "chyba pri ��tan� bloku k���a: %s\n"
@@@ -8578,138 -6899,108 +8649,138 @@@ msgstr "zmazanie bloku k���a sa nepodar
msgid "no valid recipients given\n"
msgstr "(�iadny popis)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "vyp�sa� zoznam tajn�ch k���ov"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "nespr�vny certifik�t"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "nespr�vny certifik�t"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "nespr�vny certifik�t"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr ""
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "v�bec nepou��va� termin�l"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "automaticky odpoveda� �no na v��inu ot�zok"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr ""
"prida� tento s�bor k���ov do zoznamu\n"
" pou��van�ch s�borov k���ov"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
#, fuzzy
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
"|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
" k���ov"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8720,47 -7011,38 +8791,47 @@@ msgstr "
"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "nem�em sa pripoji� k `%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(�iadny popis)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = presko�i� tento k���\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "zapisujem do '%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nem�em zavrie� `%s': %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8778,7 -7057,6 +8849,7 @@@ msgstr "vytvori� revoka�n� certifik�t
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
@@@ -8793,32 -7069,26 +8864,32 @@@ msgstr "chyba pri vytv�ran� hesla: %s\n
msgid "error reading input: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, fuzzy, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "rev? probl�m overenia revok�cie: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
@@@ -8997,7 -7234,6 +9068,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
@@@ -9007,8 -7242,6 +9078,8 @@@
msgid "certificate cached\n"
msgstr "duplicita predvo�by %c%lu\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
@@@ -9615,13 -7725,11 +9686,13 @@@ msgstr "nespr�vny certifik�t
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:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9629,85 -7737,69 +9700,85 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, fuzzy, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "duplicita predvo�by %c%lu\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "POZN�MKA: k��� bol revokovan�"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, 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:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"Podporovan� algoritmy:\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9863,12 -7921,10 +9934,12 @@@ msgstr "pou�itie: gpg [mo�nosti]
msgid "colons are not allowed in the socket name\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
@@@ -10363,77 -8317,61 +10434,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/sv.po
index f4daf3f,a88dd81..b19a857
--- a/po/sv.po
+++ b/po/sv.po
@@@ -24,7 -24,6 +24,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg trunk\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2011-01-12 14:53+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@@ -131,8 -115,6 +131,8 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Lösenfras:"
@@@ -185,25 -156,11 +185,25 @@@ msgstr "Felaktig lösenfras
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nycklar större än %d bitar stöds inte\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "kan inte skapa \"%s\": %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr "Mata in kortet med serienummer"
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
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"
@@@ -433,8 -351,6 +433,8 @@@ msgid "Please enter the new passphrase
msgstr "Ange den nya lösenfrasen"
# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -442,141 -358,103 +442,141 @@@ msgstr "
"@Flaggor:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 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:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 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:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "utförlig"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "var något tystare"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "sh-liknande kommandoutdata"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "csh-liknande kommandoutdata"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: 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:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "frigör inte från konsollen"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "fånga inte tangentbord och mus"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "använd en loggfil för servern"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PRG|använd PRG som SCdaemon-programmet"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "använd inte SCdaemon"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|connect to Assuan socket NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "ignorera begäran om att ändra TTY"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "ignorera begäran om att ändra X-display"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "använd inte mellanlagring av PIN-kod vid signering"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "tillåt inte återanvändning av gamla lösenfraser"
# Antar att värdet inte ska översättas.
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
#, fuzzy
#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
msgstr "tillåt klienter att markera nycklar som \"trusted\""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "tillåt förinställning av lösenfras"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "aktivera ssh-agent-emulering"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr ""
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
"Skicka synpunkter på översättningen till <tp-sv at listor.tp-sv.se>.\n"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -588,151 -466,120 +588,158 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: 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:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() misslyckades: %s\n"
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "katalogen \"%s\" skapades\n"
- #: agent/gpg-agent.c:1956
+ # Extension är vad? FIXME
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, 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:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, 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:2314
++#: agent/gpg-agent.c:2322
#, 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:2387
++#: agent/gpg-agent.c:2395
#, 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:2392
++#: agent/gpg-agent.c:2400
#, 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:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppad\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 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"
@@@ -750,8 -595,6 +757,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
"Underhåll av lösenordscache\n"
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -760,9 -603,6 +767,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:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -772,11 -612,9 +779,11 @@@ msgstr "
"Flaggor:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Användning: gpg-protect-tool [flaggor] (-h för hjälp)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -784,22 -622,18 +791,22 @@@ msgstr "
"Syntax: gpg-protect-tool [flaggor] [argument]\n"
"Underhållsverktyg för hemliga nycklar\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -807,11 -641,9 +814,11 @@@ msgstr "
"Ange lösenfrasen eller PIN-koden som\n"
"behövs för att färdigställa denna åtgärd."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "avbruten\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "fel vid fråga efter lösenfrasen: %s\n"
@@@ -883,8 -705,6 +890,8 @@@ msgstr "
msgid "Yes"
msgstr "Ja"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "Nej"
@@@ -916,14 -733,12 +923,14 @@@ msgstr "Korrekt
msgid "Wrong"
msgstr "Fel"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Observera: Den här lösenfrasen har aldrig blivit ändrad.%0ADu bör ändra den "
"nu."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@@ -932,15 -747,12 +939,15 @@@ msgstr "
"Den här lösenfrasen har inte ändrats%%0Asedan %.4s-%.2s-%.2s. Du bör ändra "
"den nu."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "ändra lösenfras"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "Jag ändrar den senare"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -948,19 -760,16 +955,19 @@@
"%%0A?"
msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "aktivera nyckel"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
@@@ -1002,57 -804,47 +1009,62 @@@ msgstr "skyddsalgoritmen %d%s stöds in
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "skyddsalgoritmen %d%s stöds inte\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "fel när ett rör skapades: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error creating a stream for a pipe: %s\n"
msgstr "fel när ett rör skapades: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "fel vid grening av 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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
#| msgid "error running `%s': probably not installed\n"
msgid "error running '%s': probably not installed\n"
msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
msgstr "fel vid körning av \"%s\": avslutades\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -1066,15 -856,17 +1078,21 @@@ msgstr "kommunikationsproblem med gpg-a
msgid "problem setting the gpg-agent options\n"
msgstr "inställningsproblem för gpg-agent\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "avbruten av användaren\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "problem med agenten\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "problem med agenten: %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "kan inte stänga av minnesutskrifter: %s\n"
@@@ -1145,18 -923,19 +1163,23 @@@ msgstr "slut på kärna i säkert minn
msgid "out of core while allocating %lu bytes"
msgstr "slut på kärna vid allokering av %lu byte"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 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"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, 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\n"
msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1459,7 -1171,6 +1482,7 @@@ msgstr "flagga \"%.50s\" är tvetydig\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "kommandot \"%.50s\" är tvetydigt\n"
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "slut på minne\n"
@@@ -1468,23 -1178,15 +1491,18 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "ogiltig flagga \"%.50s\"\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' not available\n"
msgid "conversion from '%s' to '%s' not available\n"
msgstr "konvertering från \"%s\" till \"%s\" är inte tillgänglig\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open misslyckades: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "conversion from '%s' to '%s' failed: %s\n"
@@@ -1527,82 -1222,64 +1545,82 @@@ msgstr "låset \"%s\" gjordes inte: %s\
msgid "waiting for lock %s...\n"
msgstr "väntar på låset %s...\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "ASCII-skal: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "ogiltig rubrikrad i ASCII-skalet: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "ASCII-skal: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "ogiltig rubrikrad i klartextsignatur\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "okänt ASCII-skalhuvud: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "flera klartextsignaturer går in i varandra\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "oväntat skal: "
# rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "ogiltig rad som börjar med bindestreck: "
# överhoppad eller hoppades över?
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "ogiltigt radix64-tecken %02X hoppades över\n"
# CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "för tidigt filslut (ingen CRC-summa)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "för tidigt filslut (i CRC-summan)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "felformaterad CRC-summa\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-fel; %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "för tidigt filslut (i den avslutande raden)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "fel i avslutande rad\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "hittade ingen giltig OpenPGP-data.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ogiltigt ASCII-skal: raden är längre än %d tecken\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@@ -1611,7 -1288,11 +1629,13 @@@
"beror sannolikt på att en felaktig e-postserver eller e-postklient har "
"använts\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "inte läsbart"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1619,82 -1300,72 +1643,94 @@@ msgstr "
"ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
"sluta med ett \"'=\"\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "en användares notationsnamn måste innehåller tecknet \"@\"\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "ett notationsnamn får inte innehålla fler än ett \"@\"-tecken\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "ett notationsvärde får inte använda några styrtecken\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "ett notationsnamn får inte innehålla fler än ett \"@\"-tecken\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
+ "sluta med ett \"'=\"\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "VARNING: ogiltig notationsdata hittades\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "inte läsbart"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "misslyckades med att förmedla %s-begäran till klient\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
#, fuzzy
#| msgid "Enter passphrase\n"
msgid "Enter passphrase: "
msgstr "Ange lösenfrasen\n"
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "kan inte göra detta i satsläge\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "Detta kommando är endast tillgängligt för kort av version 2\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Vad väljer du? "
@@@ -1756,21 -1413,11 +1792,16 @@@ msgstr "Url för att hämta publik nyck
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -1871,13 -1499,10 +1902,13 @@@ msgstr "Vilken nyckelstorlek vill du an
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:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: 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:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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"
@@@ -1939,9 -1554,6 +1970,9 @@@ msgstr " (2) Krypteringsnyckel\n
msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsnyckel\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Ogiltigt val.\n"
@@@ -1977,7 -1583,6 +2008,7 @@@ msgstr "Signera den? (j/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "avsluta denna meny"
@@@ -1985,7 -1589,6 +2016,7 @@@
msgid "show admin commands"
msgstr "visa administratörskommandon"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "visa denna hjälp"
@@@ -2063,125 -1648,96 +2094,125 @@@ msgstr "Administrationskommandon tillå
msgid "Admin commands are not allowed\n"
msgstr "Administrationskommandon tillåts inte\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Ogiltigt kommando (prova med \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output kan inte användas för detta kommando\n"
# se förra kommentaren
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "kan inte öppna \"%s\"\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "nyckeln \"%s\" hittades inte: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fel vid läsning av nyckelblock: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
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:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "Ta bort denna nyckel från nyckelringen? (j/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
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:196
++#: g10/delkey.c:195
#, 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:198
++#: g10/delkey.c:197
msgid "key"
msgstr ""
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "Publik nyckel: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "misslyckades med att radera nyckelblock: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "raderat information om ägartillit\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fel när lösenfras skapades: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "använder %s-chiffer\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "\"%s\" är redan komprimerad\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "VARNING: \"%s\" är en tom fil\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "läser från \"%s\"\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2189,7 -1745,6 +2220,7 @@@ msgstr "
"VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2198,41 -1753,34 +2229,41 @@@ msgstr "
"VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, 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"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypterad för: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, 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"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s-krypterad data\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "krypterad med en okänd algoritm %d\n"
# I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"VARNING: meddelandet krypterades med en svag nyckel\n"
"i det symmetriska chiffret.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "problem vid hanteringen av krypterat paket\n"
@@@ -2294,135 -1831,107 +2325,135 @@@ 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:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "exportera signaturer som är märkta som endast lokala"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr "exportera attribut i användaridentiteter (vanligtvis foto-id)"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "exportera spärrnycklar markerade som \"känslig\""
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "ta bort oanvändbara delar från nyckeln under exportering"
- #: g10/export.c:87
++#: g10/export.c:86
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:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: hoppade över: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "export av hemliga nycklar tillåts inte\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
- #: g10/export.c:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "VARNING: ingenting exporterat\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "Fel när \"%s\" skapades: %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[Användaridentiteten hittades inte]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, 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:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "fel vid stängning av %s: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, 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:1423
++#: g10/getkey.c:1427
#, 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:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "Inget fingeravtryck"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "skapa en signatur"
@@@ -2430,11 -1938,9 +2461,11 @@@
msgid "make a clear text signature"
msgstr "skapa en klartextsignatur"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "skapa signatur i en separat fil"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "kryptera data"
@@@ -2443,15 -1948,12 +2474,15 @@@ msgid "encryption only with symmetric c
msgstr "kryptering endast med symmetriskt chiffer"
# gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekryptera data (standard)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "validera en signatur"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "lista nycklar"
@@@ -2463,15 -1963,12 +2494,15 @@@ msgstr "lista nycklar och signaturer
msgid "list and check key signatures"
msgstr "lista och kontrollera nyckelsignaturer"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "lista nycklar och fingeravtryck"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "lista hemliga nycklar"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "generera ett nytt nyckelpar"
@@@ -2495,7 -1988,6 +2526,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "generera ett spärrcertifikat"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "ta bort nycklar från den publika nyckelringen"
@@@ -2527,7 -2013,6 +2558,7 @@@ msgstr "signera en nyckel lokalt
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "ändra en lösenfras"
@@@ -2575,23 -2049,18 +2606,23 @@@ msgstr "uppdatera tillitsdatabasen
msgid "print message digests"
msgstr "skriv ut kontrollsummor"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "kör i serverläge"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID för att signera eller dekryptera"
@@@ -2603,11 -2070,9 +2634,11 @@@ msgstr "|N|ställ in komprimeringsnivå
msgid "use canonical text mode"
msgstr "använd \"ursprunglig text\"-läget"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FIL|skriv utdata till FIL"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "gör inga ändringar"
@@@ -2621,7 -2084,6 +2652,7 @@@ 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:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2629,7 -2091,6 +2660,7 @@@ msgstr "
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2649,14 -2110,12 +2680,14 @@@ msgstr "
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2671,7 -2130,6 +2702,7 @@@ msgstr "
"signera, kontrollera, kryptera eller dekryptera\n"
"standardåtgärden beror på inmatningsdata\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2679,84 -2137,69 +2710,84 @@@ msgstr "
"\n"
"Algoritmer som stöds:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Publik nyckel: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Kontrollsumma: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "användning: gpgsm [flaggor] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
# Vad betyder detta?
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2766,21 -2209,18 +2797,21 @@@ msgstr "
"VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2791,523 -2231,412 +2822,523 @@@ msgstr "
"VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "okänd konfigurationspost \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "visa foto-id under nyckellistning"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, 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:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "visa policy-url:er under signaturlistningar"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "visa alla notationer under signaturlistningar"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "visa IETF-standardnotationer under signaturlistningar"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "visa användarangivna notationer under signaturlistningar"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "visa giltighet för användaridentitet vid nyckellistningar "
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "visa nyckelringens namn i nyckellistningar"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "visa utgångsdatum under signaturlistningar"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Tillgängliga nycklar:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "okänd flagga \"%s\"\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
#| msgid "unknown command `%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "okänt kommando \"%s\"\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, 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:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, 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:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "kunde inte tolka url till nyckelserver\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ogiltiga importeringsflaggor\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "ogiltiga importflaggor\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ogiltiga exportflaggor\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "ogiltiga exportinställningar\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ogiltiga listflaggor\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "ogiltiga listflaggor\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "visa foto-id under signaturvalidering"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "visa policy-url:er under signaturvalidering"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "visa alla notationer under signaturvalidering"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "visa IETF-standardnotationer under signaturvalidering"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "visa användarangivna notationer under signaturvalidering"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "visa giltighet för användaridentitet vid signaturvalidering"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
msgid "show only the primary user ID in signature verification"
msgstr "visa endast primär användaridentitet i signaturvalidering"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "validera signaturer med PKA-data"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr "öka tillit på signaturer med giltigt PKA-data"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ogiltiga flaggor för validering\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "ogiltiga flaggor för validering\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, 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:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
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:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, 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:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "VARNING: kör med falsk systemtid: "
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "vald sammandragsalgoritm är ogiltig\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "vald komprimeringsalgoritm är ogiltig\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
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:3509
++#: g10/gpg.c:3516
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:3511
++#: g10/gpg.c:3518
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:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
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:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "ogiltig inställning av personligt chiffer\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s fungerar ännu inte med %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [filnamn]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [filnamn]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, 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:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [filnamn]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnamn]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
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:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [filnamn]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnamn]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
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:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnamn]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [filnamn]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key användaridentitet"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key användaridentitet"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key användaridentitet [kommandon]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd <användaridentitet>"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sändning till nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "hämtning från nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "export av nyckeln misslyckades: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "export av nyckeln misslyckades: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "sökning på nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa ASCII-skal: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, 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:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[filnamn]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande här ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@@ -3322,7 -2649,6 +3353,7 @@@ msgstr "|FIL|ta nycklarna från nyckelr
msgid "make timestamp conflicts only a warning"
msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation till denna FD"
@@@ -3348,128 -2670,102 +3379,128 @@@ msgstr "Det finns ingen hjälp tillgän
msgid "No help available for '%s'"
msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "importera signaturer som är markerade som endast lokala"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "reparera skada från pks-nyckelservern under importering"
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "uppdatera inte tillitsdatabasen efter importering"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "uppdatera inte tillitsdatabasen efter importering"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "acceptera endast uppdateringar till befintliga nycklar"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "ta bort oanvändbara delar från nyckeln efter importering"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "hoppar över block av typen %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu nycklar behandlade än så länge\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antal behandlade enheter: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " överhoppade nya nycklar: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " överhoppade nya nycklar: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " utan användaridentiteter: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importerade: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " oförändrade: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nya användaridentiteter: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nya undernycklar: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " nya signaturer: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nya nyckelspärrningar: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " antal lästa hemliga nycklar: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importerade hemliga nycklar: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " oförändrade hemliga nycklar: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " inte importerade: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signaturer rensade: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " användaridentiteter rensade: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3478,205 -2774,165 +3509,205 @@@ msgstr "
"VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
"algoritmer för dessa användaridentiteter:\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": inställning för chifferalgoritmen %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": inställning för sammandragsalgoritmen %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": inställning för komprimeringsalgoritmen %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
"med att algoritmerna inte stämmer\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "nyckel %s: ingen användaridentitet\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "hoppade över \"%s\": %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
# Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
# vad innebär fnutten i slutet?
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nyckel %s: inga giltiga användaridentiteter\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "nyckel %s: ny nyckel - hoppade över\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, 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:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nyckel %s: \"%s\" inte ändrad\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nyckel %s: hemlig nyckel importerades\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, 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:1684
++#: g10/import.c:1683
#, 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:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "import av hemliga nycklar tillåts inte\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, 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"
@@@ -3691,205 -2947,188 +3722,230 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, 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:2044
++#: g10/import.c:2043
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nyckel %s: ogiltig undernyckelbindning\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
- #: g10/import.c:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nyckel %s: hoppade över undernyckel\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
#| msgid "error creating keybox `%s': %s\n"
msgid "error creating keybox '%s': %s\n"
msgstr "fel när nyckelskåpet \"%s\" skapades: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
#| msgid "keybox `%s' created\n"
msgid "keybox '%s' created\n"
msgstr "nyckelskåpet \"%s\" skapat\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "%s: nyckelring skapad\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "nyckelblockresurs \"%s\": %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, 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:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[spärr]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[självsignatur]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d felaktiga signaturer\n"
- msgstr[1] "%d felaktiga signaturer\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "Good signature from"
+ msgid " (reordered signatures follow)"
+ msgstr "Korrekt signatur från"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "skipped \"%s\": %s\n"
+ msgid "key %s:\n"
+ msgstr "hoppade över \"%s\": %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
+ msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3897,23 -3136,26 +3953,30 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signatur validerades inte eftersom nyckeln saknades\n"
msgstr[1] "1 signatur validerades inte eftersom nyckeln saknades\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 signatur validerades inte eftersom ett fel uppstod\n"
- msgstr[1] "1 signatur validerades inte eftersom ett fel uppstod\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d felaktiga signaturer\n"
+ msgstr[1] "%d felaktiga signaturer\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d användaridentiteter utan giltiga självsignaturer hittades\n"
- msgstr[1] "%d användaridentiteter utan giltiga självsignaturer hittades\n"
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Korrekt signatur från"
+ msgstr[1] "Korrekt signatur från"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3924,17 -3166,14 +3987,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:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Jag litar marginellt\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Jag litar fullständigt\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3944,51 -3183,39 +4007,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:501
++#: g10/keyedit.c:1014
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:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Användaridentiteten \"%s\" är spärrad."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Vill du verkligen fortfarande signera den? (j/N)"
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Kan inte signera.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Användaridentiteten \"%s\" är inte självsignerad."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Användaridentiteten \"%s\" är signerbar. "
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "Signera den? (j/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3997,11 -3224,9 +4060,11 @@@ msgstr "
"Självsignaturen på \"%s\"\n"
"är en signatur av PGP 2.x-typ.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4010,13 -3235,11 +4073,13 @@@ msgstr "
"Giltighetstiden för din nuvarande signatur på \"%s\"\n"
"har gått ut.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4025,44 -3248,35 +4088,44 @@@ msgstr "
"Din nuvarande signatur på \"%s\"\n"
"är en lokal signatur.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" var redan signerad av nyckeln %s\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Vill du verkligen signera den igen ändå?(j/N)"
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Det finns inget att signera med nyckeln %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Giltighetstiden för denna nyckel har gått ut!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, 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:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4071,33 -3285,27 +4134,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:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jag vill inte svara.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Jag har inte kontrollerat alls.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jag har gjort viss kontroll.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
#, 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:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4106,234 -3314,176 +4169,230 @@@ msgstr "
"Är du verkligen säker på att du vill signera denna nyckel\n"
"med din nyckel \"%s\" (%s)\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Detta kommer att bli en självsignatur.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
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:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Verkligen signera? (j/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "signeringen misslyckades: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
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:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "spara och avsluta"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "visa nyckelns fingeravtryck"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Ange nyckelhashen: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "lista nycklar och användaridentiteter"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "välj användaridentiteten N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "välj undernyckel N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "kontrollera signaturer"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"signera valda användaridentiteter [* se nedan för relaterade kommandon]"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "signera valda användaridentiteter lokalt"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "signera valda användaridentiteter med en tillitssignatur"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "lägg till en användaridentitet"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "lägg till ett foto-id"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "ta bort valda användaridentiteter"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "lägg till en undernyckel"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "lägg till en nyckel till ett smartkort"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "flytta en nyckel till ett smartkort"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "flytta en nyckelkopia till ett smartkort"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "ta bort valda undernycklar"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "lägg till en spärrnyckel"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "ta bort signaturer från valda användaridentiteter"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
msgid "change the expiration date for the key or selected subkeys"
msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "flagga vald användaridentitet som primär"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "lista inställningar (expertläge)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "lista inställningar (utförligt)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "ställ in inställningslista för valda användaridentiteter"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
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:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "ställ in en notation för valda användaridentiteter"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "ändra lösenfrasen"
# originalet borde ha ett value
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "ändra ägartillitsvärdet"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "spärra signaturer på valda användaridentiteter"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "spärra valda användaridentiteter"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "spärra nyckel eller valda undernycklar"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "aktivera nyckel"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "inaktivera nyckel"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "visa valda foto-id:n"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
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:1465
++#: g10/keyedit.c:1931
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:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Den hemliga nyckeln finns tillgänglig.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
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:1698
++#: g10/keyedit.c:2164
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4353,261 -3503,209 +4412,267 @@@ msgstr "
"signaturer\n"
" (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Nyckeln är spärrad."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "Verkligen signera alla användaridentiteter? (j/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, 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:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Okänd signaturtyp \"%s\"\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, 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:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Du måste välja åtminstone en användaridentitet.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "Verkligen flytta den primära nyckeln? (j/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Du måste välja exakt en nyckel.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "Kommandot förväntar ett filnamnsargument\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, 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:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Du måste välja åtminstone en nyckel.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
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:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "Verkligen spärra denna användaridentitet? (j/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
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:2099
++#: g10/keyedit.c:2565
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:2101
++#: g10/keyedit.c:2567
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
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:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Ställ in inställningslista till:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Spara ändringar? (j/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Avsluta utan att spara? (j/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "uppdateringen misslyckades: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
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:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "ogiltigt fingeravtryck"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, 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:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "ogiltigt värde\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Ingen sådan användaridentitet.\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, 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:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Sammandrag: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Funktioner: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "Nyckelserver no-modify"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Föredragen nyckelserver: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "Notationer: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(känsligt)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "skapat: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "spärrad: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "utgånget: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "går ut: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "kortnummer: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "tillit: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "giltighet: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Denna nyckel har stängts av"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4615,17 -3713,12 +4680,17 @@@ msgstr "
"Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
"såvida inte du startar om programmet.\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "spärrad"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "utgånget"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4634,17 -3727,14 +4699,17 @@@ msgstr "
"Detta kommando kan göra att en annan användaridentitet antas\n"
"vara den primära identiteten.\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4653,36 -3743,28 +4718,36 @@@ msgstr "
"VARNING: Detta är en nyckel av PGP2-typ. Om du lägger till ett foto-id kan\n"
" vissa versioner av PGP avvisa denna nyckel.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
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:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Vill du radera denna okända signatur? (j/N/a)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
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:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4690,20 -3772,16 +4755,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Raderade %d signatur.\n"
msgstr[1] "Raderade %d signatur.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Ingenting raderat.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "ogiltigt"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4711,17 -3789,14 +4776,17 @@@ msgid_plural "User ID \"%s\": %d signat
msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Användaridentitet \"%s\": redan minimerad\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Användaridentitet \"%s\": redan rensad\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4731,39 -3806,31 +4796,39 @@@ msgstr "
"denna\n"
" nyckel inte användas i vissa versioner av PGP.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Ange användaridentiteten för spärrnyckeln: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
# designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
- #: g10/keyedit.c:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4773,233 -3840,183 +4838,233 @@@ msgid "
msgstr ""
"Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "Ändrar utgångstid för en undernyckel.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, 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:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Välj endast en användaridentitet.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
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:4556
++#: g10/keyedit.c:5180
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:4557
++#: g10/keyedit.c:5181
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:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "Ange notationen: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "Fortsätt? (j/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen användaridentitet med indexet %d\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen användaridentitet med hashen %s\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen undernyckel med indexet %d\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "användaridentitet: \"%s\"\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (icke exporterbar)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denna signatur gick ut den %s.\n"
# nyckel? signatur?
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
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:5178
++#: g10/keyedit.c:5802
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:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "Inte signerad av dig.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (inte spärrbar)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "spärrad av din nyckel %s den %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Du är på väg att spärra dessa signaturer:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "ingen hemlig nyckel\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "användaridentiteten \"%s\" är redan spärrad\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Nyckeln %s är redan spärrad.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undernyckeln %s är redan spärrad.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
msgstr "inställningen \"%s\" förekommer flera gånger\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "för många chifferinställningar\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "för många sammandragsinställningar\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "för många komprimeringsinställningar\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "ogiltig post \"%s\" i inställningssträngen\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "skriver direkt signatur\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "skriver självsignatur\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "skriver signatur knuten till nyckeln\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
"sammandragsstorleken\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Signera"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Certifiera"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Kryptera"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Autentisera"
@@@ -5017,159 -4034,128 +5082,159 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "SsKkAaQq"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Möjliga åtgärder för en %s-nyckel: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "För närvarande tillåtna åtgärder: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Växla signeringsförmågan\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Växla krypteringsförmågan\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Växla autentiseringsförmågan\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Färdig\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Välj vilken typ av nyckel du vill ha:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA och RSA (standard)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA och Elgamal\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (endast signering)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (endast signering)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (endast kryptering)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (endast kryptering)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (ställ in dina egna förmågor)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (ställ in dina egna förmågor)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
#| msgid " (%d) DSA and Elgamal\n"
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA och Elgamal\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (endast signering)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (ställ in dina egna förmågor)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (endast kryptering)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
#| msgid " (%d) Existing key\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Befintlig nyckel\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "Ange nyckelhashen: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Inte en giltig nyckelhash (förväntade 40 hexadecimala siffror)\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "Ingen nyckel med denna nyckelhash\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för undernyckeln? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Vilken nyckelstorlek vill du ha? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "avrundade uppåt till %u bitar\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Välj vilken typ av nyckel du vill ha:\n"
# borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5186,7 -4172,6 +5251,7 @@@ msgstr "
" <n>y = nyckeln blir ogiltig efter n år\n"
# borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5202,38 -4187,30 +5267,38 @@@ msgstr "
" <n>m = signaturen blir ogiltig efter n månader\n"
" <n>y = signaturen blir ogiltig efter n år\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Signaturen är giltig hur länge? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "ogiltigt värde\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "Nyckeln går aldrig ut\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "Signaturen går aldrig ut\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "Nyckeln går ut %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "Signaturen går ut %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5241,11 -4218,9 +5306,11 @@@ msgstr "
"Ditt system kan inte visa datum senare än år 2038.\n"
"Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Stämmer detta? (j/N) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5260,7 -4235,6 +5325,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5278,50 -4252,39 +5343,50 @@@ msgstr "
" \"Gustav Vasa (Brutal kung) <gustav at trekronor.se>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Namn: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Ogiltigt tecken i namnet\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Namnet får inte börja med en siffra\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "E-postadress: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "E-postadressen är ogiltig\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Ogiltigt tecken i kommentaren\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5332,7 -4295,6 +5397,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5348,35 -4310,28 +5413,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoAa"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Rätta först felet\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5388,12 -4343,10 +5453,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:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5401,72 -4354,59 +5466,72 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "nyckeln finns redan\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, 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:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "genererar ny nyckel\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbröts.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
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:4207
++#: g10/keygen.c:4233
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"
@@@ -5476,7 -4416,6 +5541,7 @@@ msgstr "
"syfte.\n"
# c-format behövs inte i singularis
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5484,7 -4423,6 +5549,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:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5492,49 -4430,38 +5557,49 @@@ msgstr "
"nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
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:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Verkligen skapa? (j/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "aldrig"
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Viktig signaturpolicy: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Signaturpolicy: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Föredragen kritisk nyckelserver: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Kritisk signaturnotation: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Signaturnotation: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5542,55 -4469,51 +5607,63 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d felaktiga signaturer\n"
msgstr[1] "%d felaktiga signaturer\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 signatur validerades inte eftersom ett fel uppstod\n"
+ msgstr[1] "1 signatur validerades inte eftersom ett fel uppstod\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Nyckelring"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "hoppade över \"%s\": %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Primära nyckelns fingeravtryck:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr "Primära nyckelns fingeravtryck:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Undernyckelns fingeravtryck:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr "Nyckelns fingeravtryck ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " Kortets serienr ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "mellanlagrar nyckelringen \"%s\"\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5598,14 -4521,12 +5671,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
msgstr[1] "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5613,58 -4534,45 +5686,58 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 felaktig signatur\n"
msgstr[1] "1 felaktig signatur\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: nyckelring skapad\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "inkludera spärrade nycklar i sökresultatet"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "inkludera undernycklar vid sökning efter nyckel-id"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "hämta automatiskt nycklar vid validering av signaturer"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr "respektera föredragen nyckelserver-url inställd i nyckeln"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
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:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "inaktiverad"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5672,117 -4580,94 +5745,117 @@@ msgid_plural "refreshing %d keys from %
msgstr[0] "uppdaterar %d nycklar från %s\n"
msgstr[1] "uppdaterar %d nycklar från %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "nyckeln hittades inte på nyckelservern\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "begär nyckeln %s från %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "ingen nyckelserveråtgärd!\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "skickar nyckeln %s till %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, 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:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s krypterad sessionsnyckel\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "publik nyckel är %s\n"
# Men jag ändrade så det blev närmare originalet. Per
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "krypterad med %s-nyckel, id %s\n"
# Motsatsen till kryptering med symmetrisk nyckel.
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "dekryptering med publik nyckel misslyckades: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "krypterad med %lu lösenfraser\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "krypterad med with 1 lösenfras\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "antar att %s krypterade data\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
@@@ -5790,361 -4675,290 +5863,361 @@@
"istället\n"
# Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "dekrypteringen lyckades\n"
# Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekrypteringen misslyckades: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "ursprungligt filnamn=\"%.*s\"\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "VARNING: multipla klartexter har påträffats\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
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:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "ingen signatur hittades\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "FELAKTIG signatur från \"%s\""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Utgången signatur från \"%s\""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekt signatur från \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "signaturvalidering utlämnad\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "kan inte hantera detta tvetydliga signaturdata\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur gjord %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " med %s-nyckeln %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
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:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[osäkert]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " även känd som \"%s\""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Giltighetstiden för signaturen har upphört %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Giltighetstiden för signaturen går ut %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "binär"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "textläge"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "okänd"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritm: %s"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan inte kontrollera signaturen: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "detta är inte någon signatur i en separat fil\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
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:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "fristående signatur av klassen 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "signatur av den gamla (PGP 2.x) typen\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) misslyckades i %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
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:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "VARNING: använder experimentella chifferalgoritmen %s\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "läsfel i \"%s\": %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "läsfel i \"%s\": %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Använd \"%s%s\" istället\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Okomprimerad"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "okomprimerad|ingen"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, 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:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "tvetydlig flagga \"%s\"\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "okänd flagga \"%s\"\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
#, 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:1754
++#: g10/misc.c:1752
#, 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
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "Filen \"%s\" finns. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Skriv över? (j/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: okänt suffix\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Ange nytt filnamn"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "skriver till standard ut\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "antar att signerad data finns i filen \"%s\"\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "ny konfigurationsfil \"%s\" skapad\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr ""
"VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problem med agenten: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (primära nyckelns id %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6159,15 -4973,12 +6232,15 @@@ msgstr "
"%u-bitars %s-nyckel, ID %s,\n"
"skapad %s%s.\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Ange lösenfrasen\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "avbruten av användaren\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6176,53 -4987,44 +6249,53 @@@ msgstr "
"Du behöver en lösenfras för att låsa upp den hemliga\n"
"nyckeln för användaren: \"%s\"\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (undernyckel på primärt nyckel-id %s)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
#| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6281,33 -5075,26 +6354,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
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:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Nyckeln är åsidosatt"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Nyckeln har blivit komprometterad"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Nyckeln används inte längre"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "Användaridentiteten är inte längre giltig"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "anledning för spärrning: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "spärrningskommentar: "
@@@ -6322,53 -5109,42 +6395,53 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImHhAsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Inget tillitsvärde tilldelat till:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " även känd som \"%s\"\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, 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:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Jag litar INTE\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Jag litar förbehållslöst\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " h = gå tillbaka till huvudmenyn\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = hoppa över denna nyckel\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " a = avsluta\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6377,40 -5153,32 +6450,40 @@@ msgstr "
"Minimum tillitsnivå för denna nyckel är: %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Vad väljer du? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
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:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
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:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Denna nyckel tillhör oss\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6420,134 -5188,106 +6493,134 @@@ 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:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "Vill du använda nyckeln ändå? (j/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " Detta kan betyda att signaturen är förfalskad.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Obs: Denna nyckel har stängts av.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, 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:589
++#: g10/pkclist.c:604
#, 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:601
++#: g10/pkclist.c:616
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:609
++#: g10/pkclist.c:624
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:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen är sannolikt en FÖRFALSKNING.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppade över: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
# överhoppad?
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: hoppades över: publik nyckel finns redan\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "kan inte ansluta till \"%s\": %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "rad %d: ogiltig algoritm\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "rad %d: ogiltig algoritm\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Nuvarande mottagare:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6555,24 -5295,19 +6628,24 @@@ msgstr "
"\n"
"Ange användaridentiteten. Avsluta med en tom rad: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Ingen sådan användaridentitet.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Den publika nyckeln är inaktiverad.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "hoppade över: publik nyckel redan angiven\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "okänd standardmottagare \"%s\"\n"
@@@ -6580,116 -5315,92 +6653,116 @@@
# plural av adressee
# dvs. den som meddelandet är adresserat till.
# Åtskillnad görs mellan adressee och receiver.
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "inga giltiga adressater\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, 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:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Signatur i en separat fil.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Ange namnet på datafilen: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "läser från standard in ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "ingen signerad data\n"
# se förra kommentaren
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kan inte öppna signerad data fd=%d: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonym mottagare; provar med den hemliga nyckeln %s ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "ok, vi är den anonyma mottagaren.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "chifferalgoritmen %d%s är okänd eller inaktiverad\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr ""
"VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "OBSERVERA: hemliga nyckeln %s gick ut %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet misslyckades: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "nyckeln %s har inga användaridentiteter\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Kommer att spärras av:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Detta är en känslig spärrnyckel)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, 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
++#: g10/revoke.c:327
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
@@@ -6698,39 -5409,32 +6771,39 @@@
# -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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "utdata med ett ascii-skal genomdrivet.\n"
# Vad menas???
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet misslyckades: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Spärrcertifikat skapat.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "inga spärrnycklar hittades för \"%s\"\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6739,20 -5443,17 +6812,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Spärrcertifikat skapat.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6761,22 -5462,18 +6834,22 @@@ msgstr "hemliga nyckeln \"%s\" hittade
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6794,82 -5491,66 +6867,82 @@@ 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:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Välj anledning till varför nyckeln spärras:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Avbryt"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Troligen vill du välja %d här)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Anledning för spärrning: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Ingen beskrivning angiven)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Är detta OK? (j/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "skapade en svag nyckel - försöker igen\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"kan inte undvika en svag nyckel för symmetriskt chiffer;\n"
"försökte %d gånger!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, fuzzy, c-format
#| msgid "%s key uses an unsafe (%u bit) hash\n"
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "%s-nyckeln använder en osäker hash (%u bitar)\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, fuzzy, c-format
#| msgid "DSA key %s requires a %u bit or larger hash\n"
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:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
# Vad betyder det?
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "VARNING: signeringsundernyckeln %s är inte korscertifierad\n"
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "se %s för mer information\n"
# cross-certification?
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6878,7 -5559,6 +6951,7 @@@ msgstr[0] "den publika nyckeln %s är %
msgstr[1] "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
# behövs verkligen c-format här?
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6887,7 -5567,6 +6960,7 @@@ msgstr[0] "den publika nyckeln %s är %
msgstr[1] "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
# c-format behövs inte i singularis
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6903,7 -5582,6 +6976,7 @@@ msgstr[1] "
"klocka)\n"
# c-format behövs inte i singularis
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6917,42 -5595,35 +6990,42 @@@ msgstr[1] "
"nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd "
"klocka)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, 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:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"VARNING: kan inte %%-expandera anteckning (för stor). Använder den utan "
"expansion.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6960,7 -5631,6 +7033,7 @@@ msgstr "
"VARNING: kunde inte %%-expandera policy-url (för stor). Använder "
"oexpanderad.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6969,12 -5639,10 +7042,12 @@@ msgstr "
"VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
"stor). Använder oexpanderad.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s signatur från: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6982,42 -5650,34 +7055,42 @@@ msgstr "
"VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "signerar:"
- #: g10/sign.c:1256
++#: 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:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"nyckeln är inte markerad som osäker - det går inte att använda den med "
"fejkad slumptalsgenerator!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "hoppade över \"%s\": förekommer flera gånger\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "hoppade över: hemlig nyckel finns redan\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -7026,328 -5686,265 +7099,328 @@@ msgstr "
"# Skapat lista över tilldelade tillitsvärden %s\n"
"# (Använd \"gpg --import-ownertrust\" för att återställa dem)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error in '%s': %s\n"
msgstr "fel i \"%s\": %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "raden är för lång"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "kolon saknas"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "ogiltigt fingeravtryck"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "värde för ägartillit saknas"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
#| msgid "error finding trust record in `%s': %s\n"
msgid "error finding trust record in '%s': %s\n"
msgstr "fel vid sökning av tillitsvärde i \"%s\": %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "read error in '%s': %s\n"
msgstr "läsfel i \"%s\": %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
#| msgid "can't create lock for `%s'\n"
msgid "can't create lock for '%s'\n"
msgstr "kan inte skapa lås för \"%s\"\n"
# se förra kommentaren
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
#| msgid "can't lock `%s'\n"
msgid "can't lock '%s'\n"
msgstr "kan inte låsa \"%s\"\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "tillitsdatabastransaktion för stor\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:675
+ #, c-format
+ msgid "%s: directory does not exist!\n"
+ msgstr "%s: katalogen finns inte!\n"
+
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
msgstr "kan inte komma åt \"%s\": %s\n"
- #: g10/tdbio.c:688
- #, c-format
- msgid "%s: directory does not exist!\n"
- msgstr "%s: katalogen finns inte!\n"
-
- #: g10/tdbio.c:711
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: misslyckades med att skapa versionspost: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ogiltig tillitsdatabas skapad\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: tillitsdatabas skapad\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ogiltig tillitsdatabas\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: fel vid uppdatering av versionspost: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: fel vid läsning av versionspost: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: fel vid skrivning av versionspost: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "tillitsdatabas: lseek misslyckades: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: detta är inte en tillitsdatabasfil\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versionspost med postnummer %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: ogiltig filversion %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: fel vid läsning av ledig post: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: fel vid läsning av katalogpost: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: misslyckades med att nollställa en post: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: misslyckades med att lägga till en post: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "Fel: Tillitsdatabasen är skadad.\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "kan inte hantera text med rader längre än %d tecken\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "indataraden är längre än %d tecken\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "fel vid sändning av standardflaggor: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "algoritmen stöds inte: %s"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: fel vid läsning av katalogpost: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "fel vid öppnandet av \"%s\": %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "publika nyckeln %s hittades inte: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
#| msgid "error storing flags: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "fel vid lagring av flaggor: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "fel vid hämtning av ny PIN-kod: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "giltighet: %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "fel vid hämtning av lagrade flaggor: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "lista nycklar"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7355,21 -5952,18 +7428,21 @@@ msgid_plural "%ld messages signed
msgstr[0] "skriv ut kontrollsummor"
msgstr[1] "skriv ut kontrollsummor"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7379,180 -5973,161 +7452,192 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "fel när ett rör skapades: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "skriv ut kontrollsummor"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "nyckel %s: accepterad som betrodd nyckel\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, 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:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
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:431
++#: g10/trustdb.c:430
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:468
++#: g10/trustdb.c:467
#, 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:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "använder tillitsmodellen %s\n"
@@@ -7561,7 -6135,6 +7646,7 @@@
msgid "no need for a trustdb check\n"
msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
@@@ -7615,37 -6180,30 +7700,37 @@@ msgstr "hittade inga nycklar med förbe
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:2051
++#: g10/trustdb.c:2054
#, 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:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
"kunde inte uppdatera versionspost i tillitsdatabasen: skrivning "
"misslyckades: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "odefinierad"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "aldrig"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "marginell"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "fullständig"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "förbehållslös"
@@@ -7666,41 -6224,32 +7751,41 @@@
#. 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
++#: g10/trust.c:146
#, fuzzy
#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "15"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ spärrad ]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[ utgånget ]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ okänt ]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[ odefinierad ]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[ marginell ]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ fullständig ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[förbehållslös]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7710,12 -6259,10 +7795,12 @@@ msgstr "
"Kom ihåg att signaturfilen (.sig eller .asc)\n"
"ska vara den först angivna filen på kommandoraden\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "raden %u är för lång, eller saknar nyradstecken\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "kan inte öppna fd %d: %s\n"
@@@ -8053,7 -6532,6 +8138,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:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
@@@ -8207,9 -6655,6 +8292,9 @@@ msgstr "antal matchande certifikat: %d\
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "uppslag av endast-mellanlagrad dirmngr-nyckel misslyckades: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "misslyckades med att allokera keyDB-hanterare\n"
@@@ -8728,7 -7068,6 +8813,7 @@@ msgstr "(det här verkar inte vara ett
msgid "certificate '%s' not found: %s\n"
msgstr "certifikatet \"%s\" hittades inte: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "fel vid låsning av nyckelskåp: %s\n"
@@@ -8754,126 -7089,96 +8839,126 @@@ msgstr "borttagning av certifikatet \"%
msgid "no valid recipients given\n"
msgstr "inga giltiga mottagare angavs\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "lista externa nycklar"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "lista certifikatkedja"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "importera certifikat"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "exportera certifikat"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "registrera ett smartkort"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "skicka ett kommando till dirmngr"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "starta gpg-protect-tool"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "skapa base-64-kodat utdata"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "anta att inmatning är i PEM-format"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "anta att inmatning är i base-64-format"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "anta att inmatning är i binärformat"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "kontrollera aldrig mot spärrlista"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "kontrollera giltigheten med OCSP"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|antal certifikat att inkludera"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|FIL|hämta policyinformation från FIL"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "kontrollera inte certifikatpolicier"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "hämta saknade utfärdarcertifikat"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "använd inte terminalen alls"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|FIL|skriv en serverlägeslogg till FIL"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|FIL|skriv en granskningslogg till FIL"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "satsläge: fråga aldrig"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "anta ja på de flesta frågorna"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "anta nej på de flesta frågorna"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|FIL|lägg till nyckelring till listan över nyckelringar"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID som förvald hemlig nyckel"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMN|använd chifferalgoritmen NAMN"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMN|använd algoritmen NAMN för kontrollsummor"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
# Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
@@@ -8888,50 -7193,41 +8973,50 @@@ msgstr "
"signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
"standardåtgärden beror på inmatningsdata\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
#| msgid "unknown validation model `%s'\n"
msgid "unknown validation model '%s'\n"
msgstr "okänd valideringsmodell \"%s\"\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: inget värdnamn angivet\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: lösenord angivet utan användare\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: hoppar över denna rad\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "kunde inte tolka nyckelserver\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "importerar vanliga certifikat \"%s\"\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
#| msgid "can't sign using `%s': %s\n"
msgid "can't sign using '%s': %s\n"
msgstr "kan inte signera med \"%s\": %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
@@@ -8948,7 -7241,6 +9033,7 @@@ msgstr "fel vid lagring av certifikat\n
msgid "basic certificate checks failed - not imported\n"
msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "fel vid hämtning av lagrade flaggor: %s\n"
@@@ -8963,31 -7253,25 +9048,31 @@@ msgstr "fel vid import av certifikat: %
msgid "error reading input: %s\n"
msgstr "fel vid läsning av indata: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "misslyckades med att få fingeravtrycket\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "problem vid sökandet efter befintligt certifikat: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "fel vid sökning efter skrivbar keyDB: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "fel vid lagring av certifikat: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "fel vid lagring av flaggor: %s\n"
@@@ -9186,7 -7437,6 +9271,7 @@@ msgstr "Inkluderade certifikat
msgid " runtime cached certificates: %u\n"
msgstr "antal matchande certifikat: %d\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
@@@ -9198,8 -7447,6 +9283,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:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
@@@ -9871,13 -7995,11 +9956,13 @@@ msgstr "exportera certifikat
msgid "force the use of the default OCSP responder"
msgstr "Ange användaridentiteten för spärrnyckeln: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9885,90 -8007,74 +9970,90 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, 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:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "uppdateringen misslyckades: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, 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:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, 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:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate is valid\n"
msgstr "certifikatet är korrekt\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
#| msgid "certificate has been revoked"
msgid "certificate has been revoked\n"
msgstr "certifikatet har spärrats"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, 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:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported inquiry '%s'\n"
msgstr "algoritmen stöds inte: %s"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -10146,13 -8218,11 +10231,13 @@@ msgstr "användning: gpgsm [flaggor]
msgid "colons are not allowed in the socket name\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, 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:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
@@@ -10695,86 -8663,70 +10780,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, 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:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, 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:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, 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:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, 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:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/tr.po
index 04785e8,c9417fb..885b248
--- a/po/tr.po
+++ b/po/tr.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 2.0.10rc1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2015-02-11 19:18+0100\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun at belgeler.gen.tr>\n"
"Language-Team: Turkish\n"
@@@ -105,8 -89,6 +105,8 @@@ msgstr "
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Anahtar Parolası:"
@@@ -156,25 -127,11 +156,25 @@@ msgstr "Anahtar Parolası hatalı
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "\"%s\" oluşturulamıyor: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr ""
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -403,8 -321,6 +403,8 @@@ msgstr "Yeni anahtarınızı korumak i�
msgid "Please enter the new passphrase"
msgstr "Lütfen yeni anahtar parolasını girin"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -412,139 -328,101 +412,139 @@@ msgstr "
"@Seçenekler:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 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:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "sunucu olarak (önalanda) çalışır"
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "ayrıntılı"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "biraz daha sessiz olur"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "sh tarzı komut çıktısı"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "csh tarzı komut çıktısı"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "konsoldan kopulmaz"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "klavye ve fare gaspedilmez"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "sunucu için bir günlük dosyası kullanılır"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "Akıllı kart süreci kullanılmaz"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|connect to Assuan socket NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "TTY değiştirme istekleri yoksayılır"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "X birimi değiştirme istekleri yoksayılır"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "imzalarken PIN arabelleği kullanılmaz"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
#, fuzzy
#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "anahtar parolasının önceden atanmasına izin verilir"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "ssh-agent öykünümü etkinleşir"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr ""
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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 <"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -556,150 -434,118 +556,156 @@@ msgstr "
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: 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:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
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:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 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:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 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:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "dizin `%s' oluşturuldu\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
+
++#: agent/gpg-agent.c:1964
#, 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:1960
++#: agent/gpg-agent.c:1968
#, 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:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, 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:2314
++#: agent/gpg-agent.c:2322
#, 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:2387
++#: agent/gpg-agent.c:2395
#, 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:2392
++#: agent/gpg-agent.c:2400
#, 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:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s durdu\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "bu oturumda çalışan gpg-agent yok\n"
@@@ -716,8 -560,6 +722,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:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -725,9 -567,6 +731,9 @@@ msgstr "
"@Komutlar:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -737,11 -576,9 +743,11 @@@ msgstr "
"Seçenekler:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Kullanımı: gpg-protect-tool [seçenekler] (yardım için -h)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -749,16 -586,13 +755,16 @@@ msgstr "
"Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
"Gizli anahtar bakım aracı\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr ""
"PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
@@@ -766,7 -600,6 +772,7 @@@ msgstr "
"Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
"giriniz."
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -774,11 -607,9 +780,11 @@@ msgstr "
"Lütfen bu işlemi tamamlamak için gereken\n"
"PIN'i veya anahtar parolasını giriniz."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "iptal edildi\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "anahtar parolası sorulurken hata: %s\n"
@@@ -850,8 -671,6 +856,8 @@@ msgstr "
msgid "Yes"
msgstr "Evet"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "Hayır"
@@@ -883,13 -699,11 +889,13 @@@ msgstr "Doğru
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Bilginize: Bu anahtar parolası hiç değişmedi%0ALütfen şimdi değiştirin."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@@ -898,15 -712,12 +904,15 @@@ msgstr "
"Bu anahtar parolası %.4s-%.2s-%.2s tarihinden beri hiç değişmedi%%0ALütfen "
"şimdi değiştirin."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "Anahtar parolasını değiştir"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "Sonra değiştireceğim"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -914,19 -725,16 +920,19 @@@
"%%0A?"
msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "anahtarı kullanıma sokar"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA sekizin katlarında bir çittirim uzunluğu gerektirir\n"
@@@ -968,57 -769,47 +974,62 @@@ msgstr "koruma algoritması %d%s destek
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "koruma algoritması %d%s desteklenmiyor\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error creating a stream for a pipe: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
- #: common/exechelp-posix.c:427 common/exechelp-posix.c:500
- #: common/exechelp-posix.c:606 dirmngr/dirmngr.c:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "süreç çatallanırken hata: %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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
#| msgid "error running `%s': probably not installed\n"
msgid "error running '%s': probably not installed\n"
msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
msgstr "`%s' çalışırken hata: sonlandırıldı\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -1032,15 -821,17 +1043,21 @@@ msgstr "gpg-agent ile haberleşme probl
msgid "problem setting the gpg-agent options\n"
msgstr "gpg-agent seçenekleri ayarlanırken sorun çıktı\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "kullanıcı tarafından iptal edildi\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "aracı ile sorun var\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "aracı ile sorun var: %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
@@@ -1110,18 -887,19 +1127,23 @@@ msgstr "%lu bayt ayrılırken güvenli
msgid "out of core while allocating %lu bytes"
msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "yeterli bellek ayrılırken hata: %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, 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\n"
msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1430,7 -1141,6 +1452,7 @@@ msgstr "\"%.50s\" seçeneği belirsiz\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "\"%.50s\" komutu belirsiz\n"
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "nüve dışında\n"
@@@ -1439,23 -1148,15 +1461,18 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "geçersiz seçenekler \"%.50s\"\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' not available\n"
msgid "conversion from '%s' to '%s' not available\n"
msgstr "`%s' > `%s' dönüşümü elverişli değil\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open başarısız: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "conversion from '%s' to '%s' failed: %s\n"
@@@ -1498,86 -1192,72 +1515,92 @@@ msgstr "kilit `%s' yapılmadı: %s\n
msgid "waiting for lock %s...\n"
msgstr "%s kilidi için bekleniyor...\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "zırh: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "zırh başlığı geçersiz: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "zırh başlığı: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "açıkça okunabilen imza başlığı geçersiz\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "bilinmeyen zırh başlığı: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "açıkça okunabilen imzalar dahil edildi\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "beklenmeyen zırh: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "araçizgisi escape'lı satır geçersiz: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "geçersiz radix64 karakteri %02X atlandı\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "dosya sonu belirsiz (CRC yok)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "dosya sonu belirsiz (CRC içinde)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "CRC bozulmuş\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC hatası; %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "kuyruk satırında hata\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "geçerli OpenPGP verisi yok\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "geçersiz zırh: satır %d karakterden uzun\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
"sunucusu kullanılmış\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "insan okuyabilir değil"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1585,82 -1265,72 +1608,94 @@@ msgstr "
"bir simgelem ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
"sonuna bir '=' gelir.\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "bir kullanıcı simgelem ismi '@' karakteri içermeli\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "bir simgelem isminin birden fazla '@' karakteri içermemesi gerekir\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "bir simgelem değerinde kontrol karakterleri kullanılamaz\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "bir simgelem isminin birden fazla '@' karakteri içermemesi gerekir\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "bir simgelem ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
+ "sonuna bir '=' gelir.\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "insan okuyabilir değil"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
#, fuzzy
#| msgid "Enter passphrase\n"
msgid "Enter passphrase: "
msgstr "Anahtar parolasını giriniz\n"
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, 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:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, 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:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "bu önceden betik kipinde yapılamaz\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
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:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Seçiminiz? "
@@@ -1722,21 -1378,11 +1757,16 @@@ msgstr "genel anahtarın alınacağı U
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
- #: g10/card-util.c:799 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:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "`%s' yazılırken hata: %s\n"
@@@ -1827,13 -1454,10 +1857,13 @@@ msgstr "İstediğiniz anahtar uzunluğ
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u bite yuvarlandı\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 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"
@@@ -1892,9 -1506,6 +1922,9 @@@ msgstr " (2) Şifreleme anahtarı\n
msgid " (3) Authentication key\n"
msgstr " (3) Kimlik kanıtlama anahtarı\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Seçim geçersiz.\n"
@@@ -1929,7 -1534,6 +1959,7 @@@ msgstr "İmzalayacak mısınız? (e/H v
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "bu menüden çık"
@@@ -1937,7 -1540,6 +1967,7 @@@
msgid "show admin commands"
msgstr "yönetici komutlarını gösterir"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "bunu gösterir"
@@@ -2013,124 -1597,95 +2043,124 @@@ msgstr "Yönetici komutlarına izin ver
msgid "Admin commands are not allowed\n"
msgstr "Yönetici komutlarına izin verilmez\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
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:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "`%s' açılamadı\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "anahtar \"%s\" yok: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "anahtar bloğu okunurken hata: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(anahtarı parmak izi ile belirtmedikçe)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
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:149
++#: g10/delkey.c:148
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:159
++#: g10/delkey.c:158
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:196
++#: g10/delkey.c:195
#, 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:198
++#: g10/delkey.c:197
msgid "key"
msgstr ""
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "GenAnah: "
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "anahtar bloğu silinemedi: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "sahibinin güvencesi bilgisi temizlendi\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, 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:272
++#: g10/delkey.c:271
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:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "anahtar parolası oluşturulurken hata: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "%s şifrelemesi kullanılıyor\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "`%s' zaten sıkıştırılmış\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "UYARI: \"%s\" dosyası boş\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "`%s'den okunuyor\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2138,7 -1693,6 +2168,7 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
"zorlanıyor\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2147,38 -1701,31 +2177,38 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
"kullanılmak isteniyor\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s \"%s\" için şifrelendi\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s şifreli veri\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "şifreli paketin elde edilmesinde sorun var\n"
@@@ -2240,136 -1776,108 +2270,136 @@@ 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:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "sadece-yerel olarak imli imzalar ihraç edilir"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
"öznitelik kullanıcı kimliklerini (genellikle foto kimliklerini) ihraç eder"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "\"hassas\" olarak imli yürürlükten kaldırma anahtarlarını ihraç eder"
- #: g10/export.c:85
++#: g10/export.c:84
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:87
++#: g10/export.c:86
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:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: atlandı: %s\n"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "gizli anahtarların ihracına izin verilmez\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, 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:1241
++#: g10/export.c:1240
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
- #: g10/export.c:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "`%s' oluşturulurken hata: %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[Kullanıcı kimliği yok]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, 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:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "%s kapanırken hata: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, 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:1423
++#: g10/getkey.c:1427
#, 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:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "Parmak izi yok"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "gizli anahtar \"%s\" yok: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, 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:3296
++#: g10/getkey.c:3301
#, 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:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "bir imza yapar"
@@@ -2377,11 -1884,9 +2407,11 @@@
msgid "make a clear text signature"
msgstr "açıkça okunabilen bir imza yapar"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "bağımsız bir imza yapar"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "veriyi şifreler"
@@@ -2389,15 -1893,12 +2419,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik şifre ile şifreler"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "veri şifresini açar (öntanımlı)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "bir imzayı doğrular"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "anahtarları listeler"
@@@ -2409,15 -1908,12 +2439,15 @@@ msgstr "anahtarları ve imzaları liste
msgid "list and check key signatures"
msgstr "anahtar imzalarını listeler ve sınar"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "anahtarları ve parmak izlerini listeler"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "gizli anahtarları listeler"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
@@@ -2441,7 -1933,6 +2471,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "bir yürürlükten kaldırma sertifikası üretir"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "anahtarları genel anahtar zincirinden siler"
@@@ -2473,7 -1958,6 +2503,7 @@@ msgstr "bir anahtarı yerel olarak imza
msgid "sign or edit a key"
msgstr "bir anahtarı düzenler ve imzalar"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "anahtar parolası değiştirir"
@@@ -2521,23 -1994,18 +2551,23 @@@ msgstr "güvence veritabanını güncel
msgid "print message digests"
msgstr "ileti özetlerini gösterir"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "sunucu kipinde çalışır"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ascii zırhlı çıktı oluşturur"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
@@@ -2551,11 -2017,9 +2581,11 @@@ msgstr "|N|sıkıştırma seviyesi N ol
msgid "use canonical text mode"
msgstr "kurallı metin kipini kullanır"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|DOSYA|çıktı DOSYAya yazılır"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
@@@ -2567,7 -2029,6 +2597,7 @@@ msgstr "üzerine yazmadan önce sorar
msgid "use strict OpenPGP behavior"
msgstr "kesin OpenPGP davranışı etkin olur"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2575,7 -2036,6 +2605,7 @@@ msgstr "
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2595,13 -2055,11 +2625,13 @@@ msgstr "
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, 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:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2616,7 -2074,6 +2646,7 @@@ msgstr "
"imzalama, kontrol, şifreleme veya çözme\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2624,81 -2081,66 +2654,81 @@@ msgstr "
"\n"
"Desteklenen algoritmalar:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "GenAnah: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Şifre: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Sıkıştırma: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "kullanımı: gpgsm [seçenekler] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2706,19 -2148,16 +2736,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:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2727,519 -2166,408 +2757,519 @@@ 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:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, 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:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, 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:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
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:1881
++#: g10/gpg.c:1884
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:1883
++#: g10/gpg.c:1886
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:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "anahtarı iptal eder"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "`%s' seçeneği bilinmiyor\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
#| msgid "unknown command `%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "komut `%s' bilinmiyor\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, 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:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, 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:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
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:3049
++#: g10/gpg.c:3056
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:3051
++#: g10/gpg.c:3058
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:3053
++#: g10/gpg.c:3060
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:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "imzaları PKA verisi ile doğrular"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
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:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, 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:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, 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:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özet algoritması geçersiz\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
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:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
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:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
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:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "öntanımlı tercihler geçersiz\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "kişisel şifre tercihleri geçersiz\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "kişisel özet tercihleri geçersiz\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s, %s ile henüz çalışmıyor\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, 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:3741
++#: g10/gpg.c:3748
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:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [dosyaismi]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [dosyaismi]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, 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:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [dosyaismi]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [dosyaismi]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
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:3842
++#: g10/gpg.c:3849
#, 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:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [dosyaismi]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [dosyaismi]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
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:3902
++#: g10/gpg.c:3909
#, 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:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [DOSYA]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [dosyaismi]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [dosyaismi]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key kullanıcı-kimliği"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key kullanıcı-kimliği"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kullanıcı-kimliği [komutlar]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key kullanıcı-kimliği"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, 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:4179
++#: g10/gpg.c:4186
#, 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:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "anahtar sunucusunda arama başarısız: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zırhın kaldırılması başarısız: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "zırhlama başarısız: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, 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:4537
++#: g10/gpg.c:4544
#, 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:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[dosyaismi]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "İletinizi yazın ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "belirtilen sertifika güvence adresi geçersiz\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
@@@ -3251,7 -2577,6 +3281,7 @@@ msgstr "|DOSYA|anahtarlar DOSYA anahta
msgid "make timestamp conflicts only a warning"
msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|durum bilgisini bu FD'ye yazar"
@@@ -3278,128 -2599,102 +3308,128 @@@ msgstr "yardım mevcut değil
msgid "No help available for '%s'"
msgstr "\"%s\" için yardım mevcut değil"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "salt-yerel olarak imlenmiş imzaları ithal eder"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "ithalat sırasında pks anahtar sunucusundaki bozukluğu giderir"
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "ithalat sonrası güvence veritabanını güncellemez"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "ithalat sonrası güvence veritabanını güncellemez"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "güncellemeleri sadece mevcut anahtarlar için kabul eder"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "ithalat sonrası anahtardan kullanışsız parçaları kaldırır"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "ithalat sonrası anahtardan mümkün olduğunca çok şey kaldırır"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "%d türündeki blok atlanıyor\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "şu ana kadar %lu anahtar işlendi\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "İşlenmiş toplam miktar: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " yeni anahtarlar atlandı: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " yeni anahtarlar atlandı: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " kullanıcı kimliksiz: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " alınan: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " değişmedi: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " yeni kullanıcı kimliği: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " yeni yardımcı anahtarlar: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " yeni imzalar: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " yeni anahtar iptalleri: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gizli anahtarlar okundu: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " gizli anahtarlar indirildi: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " gizli anahtarlar değişmedi: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " alınamadı: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " temizlenen imzalar: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " temizlenen kullanıcı kimlikleri: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3408,204 -2703,164 +3438,204 @@@ msgstr "
"UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
"tercihler içeriyor:\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": şifreleme algoritması %s için tercih edilir\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": özet algoritması %s için tercih edilir\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
" \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
"\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "tercihlerinizi güncellemenizi ve\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
"tekrar dağıtmanızı şiddetle öneririz.\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "anahtar %s: kullanıcı kimliği yok\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "\"%s\" atlandı: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
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:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "anahtar %s: genel anahtar yok: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "anahtar %s: yeni anahtar - atlandı\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, 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:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, 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:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, 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:1202
++#: g10/import.c:1201
#, 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:1205
++#: g10/import.c:1204
#, 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:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "anahtar %s: \"%s\" %d yeni imza\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, 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:1229
++#: g10/import.c:1228
#, 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:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "anahtar %s: \"%s\" değişmedi\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "anahtar %s: gizli anahtar alındı\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, 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:1579
++#: g10/import.c:1578
#, 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:1684
++#: g10/import.c:1683
#, 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:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "gizli anahtarı alımına izin verilmez\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
@@@ -3620,209 -2875,192 +3650,234 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, 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:1898
++#: g10/import.c:1897
#, 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:1931
++#: g10/import.c:1930
#, 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:2007
++#: g10/import.c:2006
#, 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:2024
++#: g10/import.c:2023
#, 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:2026
++#: g10/import.c:2025
#, 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:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, 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:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, 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:2109
++#: g10/import.c:2108
#, 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:2122
++#: g10/import.c:2121
#, 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:2137
++#: g10/import.c:2136
#, 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:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "anahtar %s: yardımcı anahtar atlandı\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, 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:2245
++#: g10/import.c:2244
#, 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:2263
++#: g10/import.c:2262
#, 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:2277
++#: g10/import.c:2276
#, 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:2285
++#: g10/import.c:2284
#, 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:2414
++#: g10/import.c:2413
#, 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:2478
++#: g10/import.c:2477
#, 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:2494
++#: g10/import.c:2493
#, 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:2558
++#: g10/import.c:2557
#, 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:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
#| msgid "error creating keybox `%s': %s\n"
msgid "error creating keybox '%s': %s\n"
msgstr "anahtar bloku `%s' oluşturulurken hata: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
#| msgid "keybox `%s' created\n"
msgid "keybox '%s' created\n"
msgstr "`%s' anahtar bloğu oluşturuldu\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "`%s' anahtarlığı oluşturuldu\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, 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:908
++#: g10/keydb.c:907
#, 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:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "anahtar zinciri önbelleği yeniden oluşturulurken hata: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[yürürlükten kaldırma]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[öz-imza]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d kötü imza\n"
- msgstr[1] "%d kötü imza\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "kart %s özet algoritmasını desteklemiyor\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "Good signature from"
+ msgid " (reordered signatures follow)"
+ msgstr "Buradaki imzeler iyi:"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "skipped \"%s\": %s\n"
+ msgid "key %s:\n"
+ msgstr "\"%s\" atlandı: %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
+ msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3830,23 -3068,26 +3885,30 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
msgstr[1] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 imza bir hata yüzünden kontrol edilmedi\n"
- msgstr[1] "1 imza bir hata yüzünden kontrol edilmedi\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d kötü imza\n"
+ msgstr[1] "%d kötü imza\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
- msgstr[1] "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Buradaki imzeler iyi:"
+ msgstr[1] "Buradaki imzeler iyi:"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3857,17 -3098,14 +3919,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:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Şöyle böyle güveniyorum\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Tamamen güveniyorum\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3877,50 -3115,38 +3939,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:501
++#: g10/keyedit.c:1014
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:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
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:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " İmzalanamıyor.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Kullanıcı kimliği \"%s\" imzalanabilir. "
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "İmzalayacak mısınız? (e/H veya y/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3929,12 -3155,10 +3991,12 @@@ msgstr "
"\"%s\" üzerindeki öz-imza\n"
"bir PGP 2.x tarzı imza.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
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:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3943,13 -3167,11 +4005,13 @@@ msgstr "
"\"%s\" üzerindeki imzanızın\n"
"kullanım süresi dolmuş.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
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:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3958,46 -3180,37 +4020,46 @@@ msgstr "
"\"%s\" üzerindeki imzanız\n"
"dahili bir imza.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
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:824
++#: g10/keyedit.c:1337
#, 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:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
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:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Bu anahtarın kullanım süresi dolmuş!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, 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:903
++#: g10/keyedit.c:1416
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:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4006,33 -3219,27 +4068,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:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Cevabı bilmiyorum. %s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Tamamen kontrol edildi.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) İlişkisel denetim yaptım.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, 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:963
++#: g10/keyedit.c:1476
#, 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:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4042,236 -3249,178 +4104,232 @@@ msgstr "
"gerçekten\n"
"emin misiniz?\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Bu bir öz-imza olacak.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
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:1010
++#: g10/keyedit.c:1523
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:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
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:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "Bu anahtarı çok dikkatle sınadım.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "imzalama başarısız: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
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:1223
++#: g10/keyedit.c:1736
#, 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:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "bir anahtar imzası doğru yere taşınıyor\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "kaydet ve çık"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "parmakizini gösterir"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "Simgelemi giriniz: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "anahtarı ve kullanıcı kimliğini gösterir"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "N kullanıcı kimliğini seçer"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "N yardımcı anahtarını"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "imzaları sınar"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
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:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "kullanıcı kimlikleri yerel olarak imzalar"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
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:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "bir kullanıcı kimliği ekler"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "bir foto kimliği ekler"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "seçili kullanıcı kimlikleri siler"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "bir yardımcı anahtar ekler"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "bir akıllı karta bir anahtar ekler"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "bir akıllı karttan bir anahtarı taşır"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "seçili yardımcı anahtarları siler"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "bir yürürlükten kaldırma anahtarı ekler"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "seçili kullanıcı kimliklerden imzaları siler"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
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:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "seçili kullanıcı kimliğini asıl olarak imler"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "tercihleri listeler (uzman)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "tercihleri listeler (ayrıntılı)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
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:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "seçili kullanıcı kimlikleri için bir simgelem belirler"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "anahtar parolasını değiştirir"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "sahibiningüvencesini değiştirir"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
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:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
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:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "anahtarı kullanıma sokar"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "anahtarı iptal eder"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "seçili foto kimlikleri gösterir"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
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:1465
++#: g10/keyedit.c:1931
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:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Gizli anahtar mevcut.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4290,272 -3439,220 +4348,278 @@@ msgstr "
" için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı olarak "
"(ltsign, tnrsign gibi).\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Anahtar yürürlükten kaldırıldı."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
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:1780
++#: g10/keyedit.c:2246
#, 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:1788
++#: g10/keyedit.c:2254
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:1799
++#: g10/keyedit.c:2265
#, 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:1823
++#: g10/keyedit.c:2289
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%s kipindeyken bu komut kullanılamaz.\n"
- #: g10/keyedit.c:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
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:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
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:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "Komut değiştirge olarak bir dosya ismi gerektiriyor\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, 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:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "En az bir anahtar seçmelisiniz.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
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:2031
++#: g10/keyedit.c:2497
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:2069
++#: g10/keyedit.c:2535
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:2070
++#: g10/keyedit.c:2536
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:2088
++#: g10/keyedit.c:2554
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:2099
++#: g10/keyedit.c:2565
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:2101
++#: g10/keyedit.c:2567
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:2150
++#: g10/keyedit.c:2625
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:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Belirlenecek tercih listesi:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
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:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "güncelleme başarısız: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "parmakizi geçersiz"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, 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:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "değer hatalı\n"
+
++#: g10/keyedit.c:3099
#, 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:2580
++#: g10/keyedit.c:3099
#, 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:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Özet: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Özellikler: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "Anahtar sunucusu değişmez"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Tercih edilen anahtar sunucusu: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "Simgelemler: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
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:3101
++#: g10/keyedit.c:3620
#, 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:3125
++#: g10/keyedit.c:3644
#, 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:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(duyarlı)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "oluşturuldu: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "yürürlükten kaldırıldı: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "son kullanma tarihi: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "son kullanma tarihi: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "kullanımı: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "kart-no: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "güvencesi: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "geçerliliği: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Bu anahtar iptal edilmişti"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4563,17 -3660,12 +4627,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:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "yürürlükten kaldırıldı"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "zamanaşımına uğradı"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4582,17 -3674,14 +4646,17 @@@ msgstr "
" farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
" kabul edilmesini sağlayabilirsiniz.\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4601,35 -3690,27 +4665,35 @@@ msgstr "
"UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
" bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
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:3576
++#: g10/keyedit.c:4095
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:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
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:3700
++#: g10/keyedit.c:4219
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:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4637,20 -3718,16 +4701,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d imza silindi.\n"
msgstr[1] "%d imza silindi.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Hiçbir şey silinmedi.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "geçersiz"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4658,17 -3735,14 +4722,17 @@@ msgid_plural "User ID \"%s\": %d signat
msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4678,47 -3752,39 +4742,47 @@@ msgstr "
" eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
" ile sonuçlanabilir.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
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:3880
++#: g10/keyedit.c:4399
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:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
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:3961
++#: g10/keyedit.c:4479
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:3967
++#: g10/keyedit.c:4485
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:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4729,235 -3795,185 +4793,235 @@@ 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:4023
++#: g10/keyedit.c:4541
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:4026
++#: g10/keyedit.c:4544
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:4077
++#: g10/keyedit.c:4595
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:4144
++#: g10/keyedit.c:4768
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, 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:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, 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:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "Tercih ettiğiniz sunucunun adresini girin: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
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:4557
++#: g10/keyedit.c:5181
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:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "Simgelemi giriniz: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "Devam? (e/H ya da y/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "%s çittirmeli kullanıcı kimliği yok\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, 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:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "%d indisli bir yardımcı anahtar yok\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "Kullanıcı kimliği: \"%s\"\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, 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:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (dışarda geçersiz)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
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:5178
++#: g10/keyedit.c:5802
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:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, 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:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (yürülükten kaldırılmaz)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, 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:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
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:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "gizli anahtar yok\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, 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:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, 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:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
"gösteriliyor\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
msgstr "'%s' tercihi yinelendi\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "çok fazla şifreleme tercihi\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "çok fazla özet tercihi\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "çok fazla sıkıştırma tercihi\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "doğrudan imza yazılıyor\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "öz-imza yazılıyor\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "anahtarı garantileyen imzayı yazıyor\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"UYARI: bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
"çalışamayabilir\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "İmzalama"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Onayla"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Şifrele"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Kimlik kanıtla"
@@@ -4971,159 -3987,128 +5035,159 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "OoŞşKkçÇ"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "bir %s anahtarı için olası eylemler: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "Şimdilik mümkün eylemler: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) İmzalama yeteneğini açar/kapar\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Şifreleme yeteneğini açar/kapar\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Bitti\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (yalnız imzalamak için)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (sadece imzalamak için)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (yalnız şifrelemek için)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (sadece şifrelemek için)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (yeteneklerini belirtin)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (yeteneklerini belirtin)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (yalnız imzalamak için)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (yeteneklerini belirtin)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (sadece şifrelemek için)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
#| msgid " (%d) Existing key\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Mevcut anahtar\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Simgelemi giriniz: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "%d indisli bir yardımcı anahtar yok\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "İstenen anahtar uzunluğu: %u bit\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "%u bite yuvarlandı\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5139,7 -4124,6 +5203,7 @@@ msgstr "
" <n>m = anahtar n ay geçerli\n"
" <n>y = anahtar n yıl geçerli\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5155,38 -4139,30 +5219,38 @@@ msgstr "
" <n>m = imza n ay geçerli\n"
" <n>y = imza n yıl geçerli\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Anahtar ne kadar geçerli olacak? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "İmza ne kadar geçerli olacak? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "değer hatalı\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "Anahtar hep geçerli olacak\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "İmza hep geçerli olacak\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "Anahtarın geçerliliği %s de bitecek.\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "İmzanın geçerliliği %s de bitecek.\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5194,11 -4170,9 +5258,11 @@@ msgstr "
"Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
"Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Bu doğru mu? (e/H ya da y/N) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5213,7 -4187,6 +5277,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5229,50 -4202,39 +5293,50 @@@ msgstr "
"\t\"Fatih Sultan Mehmed (Padisah) <padisah at ottoman.gov>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Adınız ve Soyadınız: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Ad ve soyadınızda geçersiz karakter var\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
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:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "E-posta adresiniz: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "geçerli bir E-posta adresi değil\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Önbilgi: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Önbilgi alanında geçersiz karakter var\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5283,7 -4245,6 +5347,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
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"
@@@ -5299,37 -4260,30 +5363,37 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "AaYyEeTtKk"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
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:2652
++#: g10/keygen.c:2665
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:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Lütfen önce hatayı düzeltin\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5342,12 -4296,10 +5406,12 @@@ msgstr "
"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
"üretecine yardımcı olur. \n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5355,71 -4307,58 +5419,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "anahtar zaten mevcut\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, 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:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "yeni anahtar üretiliyor\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Anahtar üretimi durduruldu.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, 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:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5427,14 -4366,12 +5491,14 @@@ msgstr "
"Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
"\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, 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:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5442,50 -4379,39 +5506,50 @@@ msgstr "
"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
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:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "asla "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Kritik imza guvencesi: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "imza guvencesi: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Kritik tercihli anahtar sunucusu: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Kritik imza simgelemi: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "imza simgelemi: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5493,55 -4419,51 +5557,63 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d kötü imza\n"
msgstr[1] "%d kötü imza\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 imza bir hata yüzünden kontrol edilmedi\n"
+ msgstr[1] "1 imza bir hata yüzünden kontrol edilmedi\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Anahtar zinciri"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "\"%s\" atlandı: %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " Anahtar parmakizi ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " Kart seri no. ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "`%s' anahtar zinciri önbellekleniyor\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5549,14 -4471,12 +5621,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
msgstr[1] "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5564,59 -4484,46 +5636,59 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 kötü imza\n"
msgstr[1] "1 kötü imza\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anahtar zinciri oluşturuldu\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
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:94
++#: g10/keyserver.c:93
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:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "imzaları doğrularken anahtarları özdevinimli olarak alır"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr "tercihli anahtar sunucusunun adresini adrese atar"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
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:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "iptal edildi"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, 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:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5624,471 -4531,377 +5696,471 @@@ msgid_plural "refreshing %d keys from %
msgstr[0] "%d anahtar %s adresinden tazeleniyor\n"
msgstr[1] "%d anahtar %s adresinden tazeleniyor\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, 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:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "anahtar, anahtar sunucusunda yok\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, 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:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "%s anahtarı %s adresinden isteniyor\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "bir anahtar sunucusu eylemi yok!\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "%s anahtarı %s adresine gönderiliyor\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, 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:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s şifreli oturum anahtarı\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "bilinmeyen özet algoritması ile üretilmiş anahtar parolası %d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "genel anahtar: %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "genel anahtarla şifreli veri: doğru DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr ""
"%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
"oluşturuldu\n"
- #: g10/mainproc.c:496 g10/pkclist.c:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "genel anahtar şifre çözümü başarısız: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "%lu anahtar parolası ile şifrelenmiş\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "1 anahtar parolası ile şifrelenmiş\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s şifreli veri varsayılıyor\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "UYARI: ileti bütünlük korumalı değildi\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "Şifre çözme tamam\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "şifre çözme başarısız: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, 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:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "özgün dosya adı = '%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "UYAR: çok sayıda salt metin görüldü\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
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:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "hiç imza yok\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\" deki imza KÖTÜ"
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\" deki imza zamanaşımına uğramış"
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\" deki imza iyi"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "imza doğrulama engellendi\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "bu belirsiz imza verisi elde edilemiyor\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "İmza %s de\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " %s kullanılarak anahtar %s ile yapılmış\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, 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:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Anahtar burada:"
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[şüpheli]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " nam-ı diğer \"%s\""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Bu imzanın geçerliliği %s de bitti.\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "ikili"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "metinkipi"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "bilinmeyen"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritma: %s"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "İmza kontrol edilemedi: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "bir bağımsız imza değil\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "0x%02x sınıfı tek başına imza\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "eski stil (PGP 2.x) imza\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) %s de başarısız: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, 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:288
++#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "UYARI: Elgamal imza+şifre anahtarları artık önerilmiyor\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "UYARI: deneysel %s özet algoritması kullanılıyor\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "UYARI: %s özet algoritması artık önerilmiyor.\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "`%s' için okuma hatası: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "`%s' için okuma hatası: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, 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:1062
++#: g10/misc.c:1060
#, 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:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "lütfen yerine \"%s%s\" kullanınız\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, 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:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Sıkıştırılmamış"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "Sıkıştırılmamış|yok"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "bu ileti %s tarafından kullanılamayabilir\n"
- #: g10/misc.c:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "`%s' seçeneği belirsiz\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "`%s' seçeneği bilinmiyor\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
#, 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:1754
++#: g10/misc.c:1752
#, 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
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "\"%s\" dosyası var. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: bilinmeyen sonek\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Yeni dosya ismini giriniz"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "standart çıktıya yazıyor\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr ""
"UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "%d genel anahtar algoritması kullanılamadı\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "aracı ile sorun var: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (asıl anahtar kimliği %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -6102,15 -4915,12 +6174,15 @@@ msgstr "
"%u bitlik %s anahtarı, kimlik %s,\n"
"oluşturma tarihi %s%s.\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Anahtar parolasını giriniz\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "kullanıcı tarafından durduruldu\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -6119,54 -4929,45 +6191,54 @@@ msgstr "
"Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
"Anahtarın sahibi: \"%s\"\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
#| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
#| msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6224,31 -5017,24 +6296,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:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Belirtilmiş bir neden yok"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Anahtar tehlikede"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Anahtar artık kullanılmayacak"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "Kullanıcı kimliği artık geçersiz"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "yürürlükten kaldırma sebebi: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "yürürlükten kaldırma açıklaması: "
@@@ -6262,53 -5048,42 +6334,53 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "bBmMaAkK"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Güven değeri belirtilmemiş:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " namı-diğer \"%s\"\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
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:284
++#: g10/pkclist.c:283
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = bilmiyorum, kem küm\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = güvence vermem\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Son derece güveniyorum\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = ana menüye dön\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " a = bu anahtarı atla\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " ç = çık\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6317,43 -5092,35 +6389,43 @@@ msgstr "
"Bu anahtar için asgari güvence seviyesi: %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Kararınız? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
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:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Son derece güvenli bir anahtarla sonuçlanan sertifikalar:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, 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:441
++#: g10/pkclist.c:440
#, 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:447
++#: g10/pkclist.c:446
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:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Bu anahtar bizim\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6363,135 -5130,107 +6435,135 @@@ 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:497
++#: g10/pkclist.c:496
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:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
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:547
++#: g10/pkclist.c:562
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:550
++#: g10/pkclist.c:565
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:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " Bu imza sahte anlamına gelebilir.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
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:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Bilgi: Bu anahtar iptal edildi.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, 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:589
++#: g10/pkclist.c:604
#, 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:601
++#: g10/pkclist.c:616
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:609
++#: g10/pkclist.c:624
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:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
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:633
++#: g10/pkclist.c:648
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:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Bu imza SAHTE olabilir.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
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:652
++#: g10/pkclist.c:667
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:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: atlandı: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: atlandı: genel anahtar iptal edildi\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: atlandı: genel anahtar zaten var\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "`%d. satır: algoritma geçersiz\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "`%d. satır: algoritma geçersiz\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
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:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Şimdiki alıcılar:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6499,157 -5238,123 +6571,157 @@@ msgstr "
"\n"
"Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Böyle bir kullanıcı kimliği yok.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
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:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Genel anahtar iptal edildi.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "geçerli adresler yok\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, 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:1622
++#: g10/pkclist.c:1637
#, 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:85
++#: g10/plaintext.c:84
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:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Bağımsız imza.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Lütfen veri dosyasının ismini girin: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "standart girdiden okuyor ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "imzalı veri yok\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "imzalı veri fd=%d açılamadı: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "anonim alıcı: %s gizli anahtarı deneniyor ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "tamam, biz anonim alıcıyız.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "DEK'in eski kodlaması desteklenmiyor\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde yok\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "BİLGİ: %s gizli anahtarının %s tarihinde kullanım süresi doldu\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet başarısız: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "anahtar %s: kullanıcı kimliği yok\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Yürürlükten kaldıran:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "Gizli anahtar mevcut.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
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:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "ASCII zırhlı çıktı istendi.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet başarısız: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, 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:552
++#: g10/revoke.c:551
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
@@@ -6657,14 -5362,12 +6729,14 @@@ msgstr "
"Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
"ya da y/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6673,20 -5376,17 +6745,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6695,24 -5395,20 +6767,24 @@@ msgstr "gizli anahtar \"%s\" yok: %s\n
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
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:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6730,81 -5426,65 +6802,81 @@@ 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:770
++#: g10/revoke.c:769
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:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "İptal"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
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:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Yürürlükten kaldırma sebebi: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(açıklama verilmedi)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Bu tamam mı? (e/H ya da y/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "zayıf anahtar oluşturuldu - yeniden deneniyor\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
"denendi!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, fuzzy, c-format
#| msgid "%s key uses an unsafe (%u bit) hash\n"
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "%s anahtarı, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, fuzzy, c-format
#| msgid "DSA key %s requires a %u bit or larger hash\n"
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:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "UYARI: iletideki imza özeti çelişkili\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, 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:143
++#: g10/sig-check.c:145
#, 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:153
++#: g10/sig-check.c:155
#, 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:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6812,7 -5492,6 +6884,7 @@@ msgid_plural "public key %s is %lu seco
msgstr[0] "genel anahtar %s imzadan %lu saniye daha yeni\n"
msgstr[1] "genel anahtar %s imzadan %lu saniye daha yeni\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6820,7 -5499,6 +6892,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "genel anahtar %s imzadan %lu saniye daha yeni\n"
msgstr[1] "genel anahtar %s imzadan %lu saniye daha yeni\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6833,7 -5511,6 +6905,7 @@@ msgstr[0] "
msgstr[1] ""
"anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6845,45 -5522,38 +6917,45 @@@ msgstr[0] "
msgstr[1] ""
"anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, 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:451
++#: g10/sig-check.c:471
#, 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:801
++#: g10/sig-check.c:1043
#, 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:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr ""
"anahtar %s: yardımcı anahtarı garantileme imzası için yardımcı anahtar yok\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"UYARI: %% genişletmeli simgelem imkansız (çok büyük). Genişletilmeden "
"kullanılıyor.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6891,7 -5561,6 +6963,7 @@@ msgstr "
"UYARI: güvence adresi için %%lik uzatma imkansız (çok büyük).\n"
"Uzatılmadan kullanılıyor.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6900,12 -5569,10 +6972,12 @@@ msgstr "
"UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
"(çok büyük). Uzatılmadan kullanılıyor.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s imza: \"%s\" den\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6913,38 -5580,30 +6985,38 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) özet algoritması kullanılmak "
"isteniyor\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "imzalanıyor:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s şifrelemesi kullanılmayacak\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "\"%s\" atlandı: tekrarlanmış\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "atlandı: gizli anahtar zaten var\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
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:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, 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"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6953,328 -5612,265 +7025,328 @@@ msgstr "
"# Atanan güvencedeğerlerinin listesi %s oluşturuldu\n"
"# (Eski haline getirmek için \"gpg --import-ownertrust\" kullanın\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error in '%s': %s\n"
msgstr "'%s' de hata: %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "satır çok uzun"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr ": imi eksik"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "parmakizi geçersiz"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "sahibiningüvencesi değeri kayıp"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
#| msgid "error finding trust record in `%s': %s\n"
msgid "error finding trust record in '%s': %s\n"
msgstr "`%s' deki güvence kaydını ararken hata: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "read error in '%s': %s\n"
msgstr "`%s' için okuma hatası: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
#| msgid "can't create lock for `%s'\n"
msgid "can't create lock for '%s'\n"
msgstr "`%s' için kilit oluşturulamıyor\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
#| msgid "can't lock `%s'\n"
msgid "can't lock '%s'\n"
msgstr "`%s' kiltlenemedi\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "güvence veritabanı %lu kaydı: yazma başarısız (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "güvence veritabanı işlemi çok uzun\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:675
+ #, c-format
+ msgid "%s: directory does not exist!\n"
+ msgstr "%s: dizin yok!\n"
+
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
msgstr "'%s' erişilemiyor: %s\n"
- #: g10/tdbio.c:688
- #, c-format
- msgid "%s: directory does not exist!\n"
- msgstr "%s: dizin yok!\n"
-
- #: g10/tdbio.c:711
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: güvence veritabanı oluşturuldu\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: güvence veritabanı geçersiz\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: çittirim tablosu oluşturulamadı: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: sürüm kaydının güncellenmesinde hata: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "güvence veritabanı: erişim başarısız: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: bir güvence veritabanı dosyası değil\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: dosya sürümü %d geçersiz\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: serbest kaydı okuma hatası: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: dizin kaydını yazma hatası: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: kayıt sıfırlama başarısız: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: kayıt ekleme başarısız: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: güvence veritabanı oluşturuldu\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "%d karakterden daha uzun metin satırları okunamıyor\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "girdi satırı %d karakterden daha uzun\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "standart seçenekler gönderilirken hata: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "desteklenmeyen algoritma: %s"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s: dizin kaydını yazma hatası: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "'%s' açılırken hata: %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "genel anahtar %s yok: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
#| msgid "error storing flags: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "bayraklar saklanırken hata: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "yeni PIN alınırken hata: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "geçerliliği: %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "saklanmış bayraklar alınırken hata: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "anahtarları listeler"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7282,21 -5878,18 +7354,21 @@@ msgid_plural "%ld messages signed
msgstr[0] "ileti özetlerini gösterir"
msgstr[1] "ileti özetlerini gösterir"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7306,177 -5899,158 +7378,189 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "ileti özetlerini gösterir"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "anahtar %s: güvenli anahtar olarak kabul edildi\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, 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:295
++#: g10/trustdb.c:294
#, 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:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, 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:347
++#: g10/trustdb.c:346
#, 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:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, 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:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "%s güvence modeli kullanılıyor\n"
@@@ -7485,7 -6058,6 +7569,7 @@@
msgid "no need for a trustdb check\n"
msgstr "bir güvence veritabanı denetimi gereksiz\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "sonraki güvence veritabanı denetimi %s de\n"
@@@ -7535,7 -6099,6 +7619,7 @@@ msgstr "son derece güvenli bir anahta
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:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7543,29 -6106,23 +7627,29 @@@ msgstr "
"derinlik: %d geçerli: %3d imzalı: %3d güvenilir: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
"güvence veritabanının sürüm kaydı güncellenemedi: yazma başarısız: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "tanımsız"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "asla "
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "şöyle böyle"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "tamamen"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "son derece"
@@@ -7577,41 -6134,32 +7661,41 @@@
#. 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
++#: g10/trust.c:146
#, fuzzy
#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "20 translator seen trustdb.c:uid_trust_string_fixed"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[yürürlükten kalktı]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[ süresi doldu ]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ bilinmeyen ]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[ tanımsız ]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[ şöyle böyle ]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ tamamen ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ son derece ]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7621,12 -6169,10 +7705,12 @@@ msgstr "
"İmza dosyasının (.sig veya .asc) komut satırında verilecek\n"
"ilk dosya olması gerektiğini lütfen hatırlayın.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "fd %d açılamıyor: %s\n"
@@@ -7964,7 -6442,6 +8048,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:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
@@@ -8120,9 -6567,6 +8204,9 @@@ msgstr "eşleşen sertifika sayısı: %
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "dirmngr sadece-önbellek anahtar araması başarısızi: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
@@@ -8639,7 -6978,6 +8723,7 @@@ msgstr "(bu bir şifreli iletiymiş gib
msgid "certificate '%s' not found: %s\n"
msgstr "sertifika \"%s\" yok: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "anahtar bloğu kilitlenirken hata: %s\n"
@@@ -8665,127 -6999,97 +8749,127 @@@ msgstr "\"%s\" sertifikası silinemedi
msgid "no valid recipients given\n"
msgstr "geçerli alıcılar verilmedi\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "harici anahtarları listeler"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "sertifika zincirini listeler"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "sertifikaları ithal eder"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "sertifikaları ihraç eder"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "bir akıllı kartı kayda alır"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "dirmngr'a bir komut aktarır"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "gpg-protect-tool'u çalıştırır"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "base-64 kodlu çıktı oluşturur"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "girdinin PEM biçiminde olduğu kabul edilir"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "girdinin ikilik biçimde olduğu kabul edilir"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "asla bir CRL sormaz"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "doğruluğu OCSP kullarak sınar"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|içerilecek sertifika sayısı"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "sertifika poliçeleri sınanmaz"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "kayıp sertifikacı sertifikalarını alır"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "terminali hiç kullanma"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|DOSYA|bir sunucu kipi günlüğü DOSYAya yazar"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "soruların çoğunda cevap evet farzedilir"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "soruların çoğunda cevap hayır farzedilir"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
"|KULLANICI-KİMLİĞİ|öntanımlı gizli anahtar olarak KULLANICI-KİMLİĞİ "
"kullanılır"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|BELİRTİM|anahtarları aramak için bu anahtar sunucusu kullanılır"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
#| msgid ""
#| "Syntax: gpgsm [options] [files]\n"
@@@ -8800,50 -7104,41 +8884,50 @@@ msgstr "
"imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
#| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "BİLGİ:`%s'e şifrelenemez: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
#| msgid "unknown validation model `%s'\n"
msgid "unknown validation model '%s'\n"
msgstr "`%s' geçerlilik modeli bilinmiyor\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: konak adı belirtilmemiş\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: kullanıcısız parola verilmiş\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: bu satır atlanıyor\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "anahtar sunucusu çözümlenemedi\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
#| msgid "can't sign using `%s': %s\n"
msgid "can't sign using '%s': %s\n"
msgstr "`%s' kullanarak imzalanamıyor: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
@@@ -8860,7 -7152,6 +8944,7 @@@ msgstr "sertifika saklanırken hata\n
msgid "basic certificate checks failed - not imported\n"
msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "saklanmış bayraklar alınırken hata: %s\n"
@@@ -8875,31 -7164,25 +8959,31 @@@ msgstr "sertifika ithal edilirken hata
msgid "error reading input: %s\n"
msgstr "girdi okunurken hata: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "parmakizinin alınması başarısız oldu\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "mevcut sertifika aranırken sorun çıktı: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "yazılabilir anahtar veritabanı bulunurken hata: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "serifika saklanırken hata: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "bayraklar saklanırken hata: %s\n"
@@@ -9095,7 -7345,6 +9179,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:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
#| msgid " (certificate created at "
msgid "certificate already cached\n"
@@@ -9107,8 -7355,6 +9191,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:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
#| msgid "error storing certificate: %s\n"
msgid "error caching certificate: %s\n"
@@@ -9779,13 -7902,11 +9863,13 @@@ msgid "force the use of the default OCS
msgstr ""
"Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9793,90 -7914,74 +9877,90 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, 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:275
++#: dirmngr/dirmngr-client.c:281
#, 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:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, 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:342
++#: dirmngr/dirmngr-client.c:348
#, 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:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, 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:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
#| msgid "certificate is good\n"
msgid "certificate is valid\n"
msgstr "sertifika iyi durumda\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, 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:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, 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:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported inquiry '%s'\n"
msgstr "desteklenmeyen algoritma: %s"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -10052,13 -8123,11 +10136,13 @@@ msgstr "kullanımı: gpgsm [seçenekler
msgid "colons are not allowed in the socket name\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, 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:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
@@@ -10599,86 -8566,70 +10683,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, 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:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, 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:1227
++#: dirmngr/server.c:1225
#, 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:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, 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:1377
++#: dirmngr/server.c:1375
#, 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:1410
++#: dirmngr/server.c:1408
#, 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:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, 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:2409
++#: dirmngr/server.c:2408
#, 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
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/uk.po
index 2b26396,b2d6860..9eceae9
--- a/po/uk.po
+++ b/po/uk.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: GNU gnupg 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\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"
@@@ -104,8 -88,6 +104,8 @@@ msgstr "
msgid "PIN:"
msgstr "Пінкод:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "Пароль:"
@@@ -156,24 -127,10 +156,24 @@@ msgid "ssh keys greater than %d bits ar
msgstr ""
"підтримки ключів ssh, що складаються з понад %d бітів, не передбачено\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, c-format
msgid "can't create '%s': %s\n"
msgstr "не вдалося створити «%s»: %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1668
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не вдалося відкрити «%s»: %s\n"
@@@ -248,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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr "Будь ласка, вставте картку з серійним номером"
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr "Будь ласка, вийміть поточну картку і вставте картку з серійним номером"
@@@ -378,8 -296,6 +378,8 @@@ msgstr "Вкажіть пароль д�
msgid "Please enter the new passphrase"
msgstr "Вкажіть новий пароль"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -387,128 -303,92 +387,130 @@@ msgstr "
"@Параметри:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "запустити у режимі фонової служби (фоновий)"
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "запустити у режимі сервера (основному)"
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "докладний режим"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "дещо зменшити кількість повідомлень"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "виведення команд у форматі sh"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "виведення команд у форматі csh"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "прочитати параметри з вказаного файла"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "не від’єднувати від консолі"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "не захоплювати керування клавіатурою і мишею"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "використовувати файл журналу для сервера"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "використовувати вказану програму пінзаписів"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "використовувати вказану програму SCdaemon"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "не використовувати SCdaemon"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
msgid "|NAME|accept some commands via NAME"
msgstr "приймати певні команди через NAME"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "ігнорувати запити щодо зміни TTY"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "ігнорувати запити щодо зміни графічного дисплея"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "вважати кешовані пінкоди за вказану кількість секунд"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "не використовувати кеш пін-кодів для підписування"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
msgid "disallow the use of an external password cache"
msgstr "заборонити використання зовнішнього кешу паролів"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr "заборонити клієнтам позначати ключі як надійні"
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "дозволити попереднє встановлення пароля"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ #, fuzzy
+ #| msgid "allow caller to override the pinentry"
+ msgid "disallow caller to override the pinentry"
msgstr "дозволити функції виклику перевизначати pinentry"
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr "дозволити запит пароля з Emacs"
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
msgid "enable ssh support"
msgstr "увімкнути підтримку ssh"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr "увімкнути підтримку putty"
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Використання: @GPG_AGENT@ [параметри] (-h — довідка)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -516,139 -396,107 +518,145 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
"Керування закритими ключами у @GNUPG@\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "вказано некоректне значення рівня діагностики «%s»\n"
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: dirmngr/dirmngr.c:895
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
- #: agent/gpg-agent.c:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "прочитати параметри з «%s»\n"
- #: agent/gpg-agent.c:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
#, c-format
msgid "can't create socket: %s\n"
msgstr "не вдалося створити сокет: %s\n"
- #: agent/gpg-agent.c:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
- #: agent/gpg-agent.c:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "помилка під час спроби отримання поточного стану сокета\n"
- #: agent/gpg-agent.c:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "помилка listen(): %s\n"
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "очікування даних на сокеті «%s»\n"
- #: agent/gpg-agent.c:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "не вдалося створити каталог «%s»: %s\n"
- #: agent/gpg-agent.c:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "створено каталог «%s»\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "Увага: визначення прав доступу не є безпечним для %s — «%s»\n"
+
++#: agent/gpg-agent.c:1964
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "помилка stat() щодо «%s»: %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "не можна використовувати як домашній каталог «%s»\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "запущено обробки 0x%lx для файлового дескриптора %d\n"
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "обробник 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "запущено обробник ssh 0x%lx для дескриптора файла %d\n"
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s зупинено\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "у цьому сеансі не запущено gpg-agent\n"
@@@ -665,8 -511,6 +673,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
"Керування кешем паролів\n"
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -674,9 -518,6 +682,9 @@@ msgstr "
"@Команди:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -686,11 -527,9 +694,11 @@@ msgstr "
"Параметри:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "Використання: gpg-protect-tool [параметри] (-h — довідка)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -698,22 -537,18 +706,22 @@@ msgstr "
"Синтаксис: gpg-protect-tool [параметри] [аргументи]\n"
"Інструмент керування закритими ключами\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "Будь ласка, вкажіть пароль для зняття захисту з об’єкта PKCS#12."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "Будь ласка, вкажіть пароль для захисту нового об’єкта PKCS#12."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
"Будь ласка, введіть пароль для захисту імпортованого об’єкта у системі GnuPG."
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -721,11 -556,9 +729,11 @@@ msgstr "
"Будь ласка, вкажіть пароль або пінкод,\n"
"потрібні для завершення цієї дії."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "скасовано\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "помилка під час спроби запиту пароля: %s\n"
@@@ -790,8 -613,6 +798,8 @@@ msgstr "
msgid "Yes"
msgstr "Так"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "Ні"
@@@ -823,13 -641,11 +831,13 @@@ msgstr "Підтверджую
msgid "Wrong"
msgstr "Не підтверджую"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Зауваження: цей пароль ще не змінювався.%0AБудь ласка, змініть його зараз."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@@ -838,15 -654,12 +846,15 @@@ msgstr "
"Цей пароль не змінювався%%0Aз %.4s-%.2s-%.2s. Будь ласка, змініть його "
"зараз."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "Змінити пароль"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "Я зміню його пізніше"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
@@@ -854,11 -667,9 +862,11 @@@
msgstr ""
"Справді хочете вилучити ключ, що визначається keygrip%%0A %s%%0A %%C%%0A?"
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
msgid "Delete key"
msgstr "Вилучити ключ"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -867,7 -678,6 +875,7 @@@ msgstr "
"Вилучення цього ключа може призвести до неможливості отримати доступ до "
"віддалених комп’ютерів."
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "Для DSA довжина хешу має бути кратною до 8 бітів\n"
@@@ -906,54 -709,44 +914,59 @@@ msgstr "підтримки алгори
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "підтримки алгоритму захисту хешуванням %d (%s) не передбачено\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "помилка під час спроби створення каналу: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, c-format
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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "помилка під час спроби розгалужування процесу: %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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "не вдалося дочекатися завершення процесу %d: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr ""
"помилка під час спроби виконання «%s»: ймовірно, програму не встановлено\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "помилка під час спроби виконання «%s»: стан виходу %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, c-format
msgid "error running '%s': terminated\n"
msgstr "помилка під час спроби виконання «%s»: виконання перервано\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "помилка під час спроби отримання коду виходу процесу %d: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "не вдалося дочекатися завершення процесу %d: %s\n"
+
+#: common/simple-pwquery.c:376
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "не вдалося встановити з’єднання з «%s»: %s\n"
@@@ -966,15 -757,17 +979,21 @@@ msgstr "проблема під час
msgid "problem setting the gpg-agent options\n"
msgstr "проблема під час спроби встановлення параметрів gpg-agent\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "скасовано користувачем\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "проблема з агентом\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "проблема з агентом: %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "не вдалося вимкнути створення дампів образів у пам’яті: %s\n"
@@@ -1045,17 -824,18 +1064,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr "вихід за межі області під час спроби отримання %lu байтів"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "помилка під час спроби розподілу пам’яті: %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: застарілий параметр «%s» — він не працюватиме\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "УВАГА: «%s%s» є застарілим параметром — він не працюватиме\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr "невідомий прапорець діагностики «%s» проігноровано\n"
@@@ -1346,7 -1059,6 +1370,7 @@@ msgstr "параметр «%.50s» є �
msgid "command \"%.50s\" is ambiguous\n"
msgstr "команда «%.50s» є неоднозначною\n"
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "вихід за межі області пам’яті\n"
@@@ -1355,22 -1066,14 +1379,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "некоректний параметр «%.50s»\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "ви виявили ваду… (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "перетворення з «%s» у «%s» недоступне\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "помилка iconv_open: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "помилка перетворення з «%s» у «%s»: %s\n"
@@@ -1409,86 -1105,72 +1428,92 @@@ msgstr "блокування «%s» н�
msgid "waiting for lock %s...\n"
msgstr "очікування на блокування %s…\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "формат ASCII: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "некоректний заголовок ASCII: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "заголовок ASCII: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "некоректний заголовок прозорого підпису\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "некоректний заголовок ASCII: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "вкладені підписи нешифрованим текстом\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "неочікуваний формат ASCII: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "некоректний екранований дефісами рядок: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "пропущено некоректний символ radix64 %02X\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "завчасний кінець файла (немає CRC)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "завчасний кінець файла (у CRC)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "помилкове форматування CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "помилка CRC; %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "завчасний кінець файла (у додатку)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "помилка у рядку доповнення\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "не виявлено коректних даних OpenPGP.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "некоректний формат ASCII: рядок є довшим за %d символів\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"символи quoted printable у кодуванні ASCII — ймовірно, використано "
"помилковий MTA\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "незручне для читання"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1496,80 -1178,70 +1521,92 @@@ msgstr "
"назва примітки має складатися з друкованих символів або пробілів і "
"завершуватися символом «=»\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "назва примітки користувача має містити символ «@»\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "назва примітки не повинна містити більше за один символ «@»\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "у значенні примітки не повинно міститися керівних символів\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "назва примітки не повинна містити більше за один символ «@»\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+ "назва примітки має складатися з друкованих символів або пробілів і "
+ "завершуватися символом «=»\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "УВАГА: виявлено некоректні дані примітки\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "незручне для читання"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "не вдалося пропустити через проксі запит %s до клієнта\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "Введіть пароль: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "УВАГА: %s перевизначає %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Не вдалося отримати доступ до картки OpenPGP: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Виявлено картку OpenPGP з номером %s\n"
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "це не можна робити у пакетному режимі\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "Цією командою можна користуватися лише для карток версії 2\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
msgid "Reset Code not or not anymore available\n"
msgstr "Немає коду скидання або код скидання вже недоступний\n"
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ваш вибір? "
@@@ -1632,20 -1290,10 +1669,15 @@@ msgstr "Адреса для отрим�
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Помилка: адреса є занадто довгою (максимум — %d символів).\n"
- #: g10/card-util.c:799 tools/no-libgcrypt.c:30
- #, c-format
- msgid "error allocating enough memory: %s\n"
- msgstr "помилка під час спроби розподілу пам’яті: %s\n"
-
- #: g10/card-util.c:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
@@@ -1742,13 -1371,10 +1774,13 @@@ msgstr "Яким має бути роз
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Якому розміру ключа для розпізнавання ви надаєте перевагу? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлено до %u бітів\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
@@@ -1803,9 -1419,6 +1835,9 @@@ msgstr " (2) Ключ шифрува�
msgid " (3) Authentication key\n"
msgstr " (3) Ключ розпізнавання\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Некоректний вибір.\n"
@@@ -1837,7 -1444,6 +1869,7 @@@ msgid "Really do a factory reset? (ente
msgstr ""
"Справді хочете скинути усе до типових налаштувань? (введіть «yes» («так»)) "
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "вийти з цього меню"
@@@ -1845,7 -1450,6 +1877,7 @@@
msgid "show admin commands"
msgstr "показати керівні команди"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "показати цю довідкову інформацію"
@@@ -1921,118 -1507,89 +1953,118 @@@ msgstr "Команди адмініст
msgid "Admin commands are not allowed\n"
msgstr "Команди адміністрування заборонено\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "Некоректна команда (скористайтеся командою «help»)\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output не працює з цією командою\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "не вдалося відкрити «%s»\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ «%s» не знайдено: %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "помилка під час спроби читання блокування ключа: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(якщо ключ не задано відбитком)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "цього не можна робити у пакетному режимі без «--yes»\n"
- #: g10/delkey.c:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "Вилучити цей ключ зі сховища? (y/N або т/Н) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Цей ключ є закритим! Вилучити його? (y/N або т/Н) "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "помилка під час спроби вилучення закритого %s: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "ключ"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "subkey"
msgstr "підключ"
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "не вдалося вилучити блокування ключа: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "дані щодо довіри до власника вилучено\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "маємо закритий ключ для відкритого ключа «%s»!\n"
- #: g10/delkey.c:272
++#: g10/delkey.c:271
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr ""
"спершу скористайтеся параметром «--delete-secret-keys» для його вилучення.\n"
- #: g10/encrypt.c:226 g10/sign.c:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "помилка під час спроби створення пароля: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "не можна використовувати симетричний пакет ESK через режим S2K\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "використано шифр %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, c-format
msgid "'%s' already compressed\n"
msgstr "«%s» вже стиснено\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "УВАГА: файл «%s» є порожнім\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, c-format
msgid "reading from '%s'\n"
msgstr "читання з «%s»\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -2040,7 -1597,6 +2072,7 @@@ msgstr "
"УВАГА: примусове використання симетричного шифру %s (%d) не відповідає "
"параметрам отримувача\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2049,40 -1605,33 +2081,40 @@@ msgstr "
"УВАГА: примусове використання алгоритму стиснення %s (%d) не відповідає "
"параметрам отримувача\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"примусове використання симетричного шифру %s (%d) не відповідає параметрам "
"отримувача\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "не можна використовувати %s у режимі %s\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для «%s»\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "не можна використовувати %s у режимі %s\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "Дані, зашифровані за алгоритмом %s\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "зашифровано за допомогою невідомого алгоритму %d\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"УВАГА: повідомлення зашифровано слабким ключем з симетричним шифруванням.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "проблема з обробкою зашифрованого пакета\n"
@@@ -2141,134 -1679,106 +2173,134 @@@ msgstr "УВАГА: не вдалос�
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "УВАГА: не вдалося вилучити тимчасовий каталог «%s»: %s\n"
- #: g10/export.c:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr ""
"експортувати підписи, які позначено як придатні лише для локального "
"використання"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
"експортувати ідентифікатори користувача атрибута (типово фотоідентифікатори)"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "експортувати ключі відкликання, позначені як «важливі»"
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "вилучити невикористовувані частини ключа під час експортування"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr "вилучити максимум частин з ключа під час експортування"
- #: g10/export.c:896
++#: g10/export.c:895
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "експортування закритих ключів заборонено\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: ключ у стилі PGP 2.x — пропущено\n"
- #: g10/export.c:1241
++#: g10/export.c:1240
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "ключ %s: матеріал ключа на карті — пропущено\n"
- #: g10/export.c:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "УВАГА: нічого не експортовано\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "помилка створення «%s»: %s.\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[Ідентифікатор не знайдено]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
msgstr "не вказано аргументу до параметра «%.50s»\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "помилка під час спроби закрити %s: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "автоматично отримано «%s» за допомогою %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "помилка під час спроби отримання «%s» за допомогою %s: %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "Без відбитка"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "закритий ключ «%s» не знайдено: %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAME|використовувати вказаний типовий закритий ключ"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAME|використовувати вказаний типовий закритий ключ"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Некоректний ключ %s визнано чинним через параметр --allow-non-selfsigned-"
"uid\n"
- #: g10/getkey.c:3296
++#: g10/getkey.c:3301
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "використовуємо підключ %s замість основного ключа %s\n"
- #: g10/gpg.c:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "створити підпис"
@@@ -2276,11 -1785,9 +2308,11 @@@
msgid "make a clear text signature"
msgstr "створити текстовий підпис"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "створити від’єднаний підпис"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "зашифрувати дані"
@@@ -2288,15 -1794,12 +2320,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "шифрувати лише за допомогою симетричного шифру"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "розшифрувати дані (типова дія)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "перевірити підпис"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "показати список ключів"
@@@ -2308,15 -1809,12 +2340,15 @@@ msgstr "показати список �
msgid "list and check key signatures"
msgstr "показати список і перевірити підписи ключів"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "показати список ключів і відбитків"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "показати список закритих ключів"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "створити пару ключів"
@@@ -2336,7 -1830,6 +2368,7 @@@ msgstr "повноцінне створ
msgid "generate a revocation certificate"
msgstr "створити сертифікат відкликання"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "вилучити ключі з відкритого сховища ключів"
@@@ -2364,7 -1851,6 +2396,7 @@@ msgstr "підписати ключ л�
msgid "sign or edit a key"
msgstr "підписати або редагувати ключ"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "змінити пароль"
@@@ -2412,23 -1887,20 +2444,25 @@@ msgstr "оновити базу дан�
msgid "print message digests"
msgstr "показати контрольні суми повідомлень"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "запустити у режимі сервера"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ #, fuzzy
+ #| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr "встановити правила TOFU для ключа (good, unknown, bad, ask, auto)"
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "створити дані у форматі ASCII"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|USER-ID|використовувати для створення підписів або розшифрування вказаний "
@@@ -2442,11 -1912,9 +2476,11 @@@ msgstr "|N|встановити рів�
msgid "use canonical text mode"
msgstr "використовувати канонічний текстовий режим"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|записати дані до вказаного файла"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "не вносити змін"
@@@ -2458,7 -1924,6 +2492,7 @@@ msgstr "запитувати пере�
msgid "use strict OpenPGP behavior"
msgstr "строго використовувати стандарт OpenPGP"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2467,7 -1932,6 +2501,7 @@@ msgstr "
"(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
"довідника (man))\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2488,11 -1952,9 +2522,11 @@@ msgstr "
" --list-keys [назви] показати ключі\n"
" --fingerprint [назви] показати відбитки\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Використання: @GPG@ [параметри] [файли] (-h — довідка)"
- #: g10/gpg.c:988
++#: g10/gpg.c:991
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2502,7 -1964,6 +2536,7 @@@ msgstr "
"Підписування, перевірка підписів, шифрування або розшифрування\n"
"Типова дія залежатиме від вхідних даних\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2510,76 -1971,61 +2544,76 @@@ msgstr "
"\n"
"Підтримувані алгоритми:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "Відкритий ключ: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "Шифр: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "Хеш: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "Стиснення: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "користування: %s [параметри] %s\n"
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "несумісні команди\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "у визначенні групи «%s» немає знаку «=»\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1537
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2587,21 -2033,18 +2621,21 @@@ msgstr "
"УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1546
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
"«%s» не є безпечним\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1549
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2609,516 -2052,405 +2643,516 @@@ msgstr "
"УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1759
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "невідомий пункт налаштувань «%s»\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "показувати фотоідентифікатори у списках ключів"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
msgid "show key usage information during key listings"
msgstr "показувати дані щодо використання ключа у списках ключів"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "показувати адреси правил у списках підписів"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "показувати всі примітки у списках підписів"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "показувати стандартні примітки IETF у списках підписів"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "показувати примітки користувача у списках підписів"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr "показувати адреси основних серверів ключів у списках підписів"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"ключів"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr "показувати відкликані та застарілі підключі у списках ключів"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "показувати назву сховища ключів у списках ключів"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "показувати дати завершення строків дії у списку підписів"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Доступні ключі:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "невідомі правила TOFU «%s»\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "невідомий формат бази даних TOFU «%s»\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
- #: g10/gpg.c:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt занадто стара (потрібна — %s, маємо %s)\n"
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: g10/gpg.c:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "некоректний режим pinentry, «%s»\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "«%s» не є коректним набором символів\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "не вдалося обробити адресу сервера ключів\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: некоректні параметри сервера ключів\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "некоректні параметри сервера ключів\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: некоректні параметри імпортування\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "некоректні параметри імпортування\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: некоректні параметри експортування\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "некоректні параметри експортування\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: некоректні параметри побудови списку\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "некоректні параметри побудови списку\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "показувати фотоідентифікатори під час перевірки підписів"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "показувати адреси правил під час перевірки підписів"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "показувати всі примітки під час перевірки підписів"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "показувати стандартні примітки IETF під час перевірки підписів"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "показувати вказані користувачем примітки під час перевірки підписів"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"показувати адреси основних серверів ключів у списках перевірки підписів"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr ""
"показувати чинність ідентифікаторів користувача під час перевірки підписів"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"перевірки підписів"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
msgid "show only the primary user ID in signature verification"
msgstr ""
"показувати лише основний ідентифікатор користувача під час перевірки підписів"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "перевірити підписи за допомогою даних PKA"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr "підняти рівень довіри до підписів з коректними даними PKA"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: некоректні параметри перевірки\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "некоректні параметри перевірки\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не вдалося встановити шлях для запуску у значення %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: некоректний список auto-key-locate\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "некоректний список auto-key-locate\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "УВАГА: %s перевизначає %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не можна використовувати разом з %s!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s є зайвим, якщо використано %s!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "УВАГА: запущено з фіктивним системним часом: "
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "вибраний алгоритм шифрування є некоректним\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "вибраний алгоритм стискання є некоректним\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "значення completes-needed має бути більшим за 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "значення marginals-needed має перевищувати 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
- #: g10/gpg.c:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3527
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
"S2K (0)\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3531
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "некоректні типові параметри\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "некоректні особисті параметри шифрування\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "некоректні особисті параметри контрольної суми\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "некоректні особисті параметри стискання\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ще не може працювати разом з %s\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3638
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
"%s\n"
- #: g10/gpg.c:3636
++#: g10/gpg.c:3643
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
"ключем\n"
- #: g10/gpg.c:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [назва файла]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [назва файла]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [назва файла]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [назва файла]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
"mode 0\n"
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
- #: g10/gpg.c:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [назва файла]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [назва файла]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [назва файла]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
"s2k-mode 0\n"
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
"%s\n"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [назва файла]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [назва файла]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [назва файла]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [команди]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd <ідентифікатор-користувача>"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "помилка під час спроби експортування ключа: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "помилка під час спроби експортування ключа: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "помилка пошуку на сервері ключів: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "помилка оновлення з сервера ключів: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "помилка перетворення з формату ASCII: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "помилка перетворення у формат ASCII: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "некоректний алгоритм хешування «%s»\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, 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:4549
++#: g10/gpg.c:4556
#, 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:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[назва файла]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "Почніть вводити ваше повідомлення...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "вказана адреса правил сертифікації є некоректною\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "вказана адреса правил підписування є некоректною\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "вказана адреса основного сервера ключів є некоректною\n"
@@@ -3130,7 -2460,6 +3164,7 @@@ msgstr "визначити ключі �
msgid "make timestamp conflicts only a warning"
msgstr "супроводжувати конфлікти часових позначок лише попередженнями"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "записувати до дескриптора файла дані щодо стану"
@@@ -3155,125 -2480,99 +3189,125 @@@ msgstr "Довідки не перед�
msgid "No help available for '%s'"
msgstr "Довідки щодо %s не виявлено"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "імпортувати підписи, позначені як лише локальні"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "відновлювати пошкодження сервером ключів pks під час імпортування"
- #: g10/import.c:111
++#: g10/import.c:110
msgid "do not clear the ownertrust values during import"
msgstr "не вилучати значень власної довіри під час імпортування"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "не оновлювати базу даних довіри після імпортування"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "приймати оновлення лише вже створених ключів"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "вилучити невикористані частини ключа після імпортування"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "вилучити максимум частин з ключа після імпортування"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "пропускаємо блок типу %d\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "оброблено %lu ключів\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Загалом оброблено: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " пропущено ключів PGP-2: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "пропущено нових ключів: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " без ід. користувача: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " імпортовано: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " без змін: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr "нових ід. користувачів: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " нових підключів: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " нових підписів: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr "відкликань нових ключів: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr "прочитано закритих ключів: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "імпортовано закр. ключів: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " закр. ключів без змін: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " не імпортовано: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " вилучених підписів: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " вилучених ід. корист.: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3282,196 -2581,156 +3316,196 @@@ msgstr "
"УВАГА: у ключі %s містяться записи надання переваги\n"
"недоступним алгоритмам для таких ід. користувачів:\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " «%s»: перевага алгоритму шифрування %s\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " «%s»: перевага алгоритму контрольних сум %s\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " «%s»: перевага алгоритму стискання %s\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "наполегливо рекомендуємо вам оновити записи переваг і\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"повторно поширити цей ключ, щоб уникнути потенційних проблем з алгоритмами\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"оновити записи перевад можна за допомогою команди: gpg --edit-key %s updpref "
"save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: немає ідентифікатор користувача\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, c-format
msgid "key %s: %s\n"
msgstr "ключ %s: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr "відкинуто екранувальником імпорту"
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "ключ %s: відновлено пошкоджений підключ PKS\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "ключ %s: прийнято несамопідписаний ідентифікатор користувача «%s»\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "ключ %s: немає чинних ідентифікаторів користувача\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "причиною цього може бути те, що немає самопідпису\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новий ключ — пропущено\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "не виявлено придатного до запису сховища ключів: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "записуємо до «%s»\n"
- #: g10/import.c:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "помилка під час спроби запису сховища ключів «%s»: %s\n"
- #: g10/import.c:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: імпортовано відкритий ключ «%s»\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не відповідає нашій копії\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
- #: g10/import.c:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
- #: g10/import.c:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: «%s» 1 новий ідентифікатор користувача\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: «%s» %d нових ідентифікаторів користувачів\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: «%s» 1 новий підпис\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: «%s» %d нових підписів\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: «%s» 1 новий підключ\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: «%s» %d нових підключів\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: «%s» вилучено %d підпис\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: «%s» вилучено %d підписів\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: «%s» спорожнено %d ідентифікатор користувача\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: «%s» спорожнено %d ідентифікаторів користувачів\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: «%s» не змінено\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "ключ %s: імпортовано закритий ключ\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "ключ %s: закритий ключ вже існує\n"
- #: g10/import.c:1579
++#: g10/import.c:1578
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "ключ %s: помилка під час спроби надсилання агенту: %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, c-format
msgid "secret key %s: %s\n"
msgstr "закритий ключ %s: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "імпортування закритих ключів заборонено\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
@@@ -3486,199 -2745,182 +3520,224 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"ключ %s: немає відкритого ключа — не можна застосовувати сертифікат "
"відкликання\n"
- #: g10/import.c:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: некоректний сертифікат відкликання: %s — відкинуто\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: імпортовано сертифікат відкликання «%s»\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: немає ідентифікатор користувача для підпису\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: непідтримуваний алгоритм створення відкритого ключа для "
"ідентифікатора користувача «%s»\n"
- #: g10/import.c:2026
++#: g10/import.c:2025
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %s: некоректний самопідпис для ідентифікатора користувача «%s»\n"
- #: g10/import.c:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ключ %s: некоректний безпосередній підпис ключа\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: немає підключа для зв’язування ключів\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: некоректне зв’язування підключів\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: вилучено кратне зв’язування підключів\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: немає підключа для відкликання ключа\n"
- #: g10/import.c:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: некоректне відкликання підключа\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: вилучено кратне відкликання підключа\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущено ідентифікатор користувача «%s»\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущено підключ\n"
- #: g10/import.c:2234
++#: g10/import.c:2233
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: непридатний до експорту підпис (клас 0x%02X) — пропущено\n"
- #: g10/import.c:2245
++#: g10/import.c:2244
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертифікат відкликання у помилковому місці — пропущено\n"
- #: g10/import.c:2263
++#: g10/import.c:2262
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: некоректний сертифікат відкликання: %s — пропущено\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: підпис підключа у помилковому місці — пропущено\n"
- #: g10/import.c:2285
++#: g10/import.c:2284
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неочікуваний клас підпису (0x%02X) — пропущено\n"
- #: g10/import.c:2414
++#: g10/import.c:2413
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: виявлено дублювання ідентифікаторів користувача — об’єднано\n"
- #: g10/import.c:2478
++#: g10/import.c:2477
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "УВАГА: ключ %s могло бути відкликано: отримуємо ключ відкликання %s\n"
- #: g10/import.c:2494
++#: g10/import.c:2493
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "УВАГА: ключ %s могло бути відкликано: ключа відкликання %s немає.\n"
- #: g10/import.c:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: додано сертифікат відкликання «%s»\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: додано безпосередній підпис ключа\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, c-format
msgid "error creating keyring '%s': %s\n"
msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, c-format
msgid "keybox '%s' created\n"
msgstr "створено сховище ключів «%s»\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, c-format
msgid "keyring '%s' created\n"
msgstr "створено сховище ключів «%s»\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "ресурс блоку ключів «%s»: %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening key DB: %s\n"
msgstr "помилка під час відкриття «%s»: %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "не вдалося перебудувати кеш сховища ключів: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[відкликання]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[самопідпис]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d помилкових підписів\n"
- msgstr[1] "%d помилкових підписів\n"
- msgstr[2] "%d помилкових підписів\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "карткою не підтримується алгоритм контрольних сум %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "Good signature from"
+ msgid " (reordered signatures follow)"
+ msgstr "Правильний підпис від"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "key %s: %s\n"
+ msgid "key %s:\n"
+ msgstr "ключ %s: %s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "Ідентифікатор користувача «%s»: вилучено %d підпис\n"
+ msgstr[1] "Ідентифікатор користувача «%s»: вилучено %d підпис\n"
+ msgstr[2] "Ідентифікатор користувача «%s»: вилучено %d підпис\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3687,28 -2929,28 +3746,32 @@@ msgstr[0] "1 підпис не пере
msgstr[1] "1 підпис не перевірено через те, що немає ключа\n"
msgstr[2] "1 підпис не перевірено через те, що немає ключа\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 підпис не перевірено через помилку\n"
- msgstr[1] "1 підпис не перевірено через помилку\n"
- msgstr[2] "1 підпис не перевірено через помилку\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d помилкових підписів\n"
+ msgstr[1] "%d помилкових підписів\n"
+ msgstr[2] "%d помилкових підписів\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] ""
- "виявлено %d ідентифікаторів користувачів без коректних самопідписів\n"
- msgstr[1] ""
- "виявлено %d ідентифікаторів користувачів без коректних самопідписів\n"
- msgstr[2] ""
- "виявлено %d ідентифікаторів користувачів без коректних самопідписів\n"
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "Правильний підпис від"
+ msgstr[1] "Правильний підпис від"
+ msgstr[2] "Правильний підпис від"
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
+
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3719,17 -2961,14 +3782,17 @@@ msgstr "
"ключів інших\n"
"користувачів (за паспортами, відбитками з інших джерел тощо)\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Я довіряю не повністю\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Я довіряю повністю\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3739,52 -2978,40 +3802,52 @@@ msgstr "
"Глибина, більша за 1, дозволяє ключу, який ви підписуєте, створювати\n"
"надійні підписи від вашого імені.\n"
- #: g10/keyedit.c:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Будь ласка, вкажіть домен обмеження цього підпису або натисніть Enter, якщо "
"такого домену немає.\n"
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Ідентифікатор користувача «%s» відкликано."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Ви певні, що все ще бажаєте підписати його? (y/N або т/Н) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " Неможливо підписати.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Строк дії ідентифікатор користувача «%s» сплив."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Ідентифікатор користувача «%s» не є самопідписаним."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Ідентифікатор користувача «%s» можна підписувати. "
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "Підписати його? (y/N або т/Н) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3793,12 -3020,10 +3856,12 @@@ msgstr "
"Самопідпис «%s»\n"
"є підписом у форматі PGP 2.x.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
"Бажаєте розширити сферу використання до самопідпису OpenPGP? (y/N або т/Н) "
- #: g10/keyedit.c:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3807,11 -3032,9 +3870,11 @@@ msgstr "
"Строк дії вашого поточного підпису «%s»\n"
"завершено.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Бажаєте видати новий підпис для заміни застарілого? (y/N або т/Н) "
- #: g10/keyedit.c:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3820,45 -3043,36 +3883,45 @@@ msgstr "
"Ваш поточний підпис «%s»\n"
"є локальним підписом.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Бажаєте розширити сферу використання до повністю експортованого підпису? (y/"
"N або т/Н) "
- #: g10/keyedit.c:824
++#: g10/keyedit.c:1337
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "«%s» вже було локально підписано ключем %s\n"
- #: g10/keyedit.c:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "«%s» вже було підписано ключем %s\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Бажаєте підписати його попри все? (y/N або т/Н) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Нічого підписувати ключем %s\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "Строк дії цього ключа вичерпано!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Строк дії цього ключа завершиться %s.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Бажаєте, щоб строк дії вашого підпису був таким самим? (Y/n або Т/н) "
- #: g10/keyedit.c:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3869,265 -3083,201 +3932,261 @@@ msgstr "
"справді належить особі, ім’я якої вказано вище? Якщо ви не знаєте відповіді, "
"введіть «0».\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Не буду відповідати.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Мною не виконувалося ніяких перевірок.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Мною виконано часткову перевірку.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Мною виконано ретельну перевірку.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
msgid "Your selection? (enter '?' for more information): "
msgstr "Ваш вибір? (введіть «?», щоб дізнатися більше): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, 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:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "Це буде самопідпис.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "УВАГА: підпис не буде позначено як непридатний до експортування.\n"
- #: g10/keyedit.c:1010
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "УВАГА: підпис не буде позначено як непридатний до відкликання.\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "Підпис буде позначено як непридатний до експортування.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "Підпис буде позначено як непридатний до відкликання.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "Цей ключ не перевірявся мною.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "Цей ключ перевірено мною частково.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "Цей ключ ретельно перевірено мною.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "Підписати? (y/N або т/Н) "
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "помилка під час спроби підписування: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"До ключа включено лише типовий заповнювач або записи ключа з картки — ніяких "
"паролів не потрібно змінювати.\n"
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "ключ %s: помилка під час спроби зміни пароля: %s\n"
- #: g10/keyedit.c:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "пересування підпису ключа у належне місце\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "зберегти і вийти"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "показати відбиток ключа"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
msgid "show the keygrip"
msgstr "показати keygrip"
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "показати список ключів та ідентифікаторів користувача"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "вибрати вказаний ідентифікатор користувача"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "вибрати вказаний підключ"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "перевірити підписи"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"підписати вибрані ідентифікатори користувачів [* нижче наведено відповідні "
"команди]"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "підписати вибрані ідентифікатори користувача локально"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "підписати вибрані ідентифікатори користувача підписом надійності"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
"підписати вибрані ідентифікатори користувача підписом, який не можна "
"відкликати"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "додати ідентифікатор користувача"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "додати фотоідентифікатор"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "вилучити вибрані ідентифікатори користувача"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "додати підключ"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "додати ключ на картку пам’яті"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "пересунути ключ на картку пам’яті"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "пересунути резервний ключ на картку пам’яті"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "вилучити вибрані підключі"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "додати ключ відкликання"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "вилучити підписи з вибраних ідентифікаторів користувача"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
msgid "change the expiration date for the key or selected subkeys"
msgstr "змінити дату завершення строку дії ключа або вибраних ключів"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "позначити вибраний ідентифікатор користувача як основний"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "список переваг (експертний)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "список переваг (докладний)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "встановити список параметрів для вибраних ідентифікаторів користувачів"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"встановити адресу основного сервера ключів для вибраних ідентифікаторів "
"користувачів"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "встановити примітку для вибраного ідентифікатора користувача"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "змінити пароль"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "змінити рівень довіри до власника"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "відкликати підписи для вибраних ідентифікаторів користувачів"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "відкликати вибрані ідентифікатори користувачів"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "відкликати ключ або вибрані підключі"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "увімкнути ключ"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "вимкнути ключ"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "показати вибрані фотоідентифікатори"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
"невикористані підписи з ключа"
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
"всі підписи з ключа"
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "Доступний закритий ключ.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "Для цього потрібен закритий ключ.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4138,250 -3288,198 +4197,256 @@@ msgstr "
" «t» для надійних підписів (tsign), «nr» для підписів без відкликання\n"
" (nrsign) або будь-яку комбінацію (ltsign, tnrsign тощо).\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "Ключ відкликано."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "Підказка: виберіть ідентифікатори користувача для підписування\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Невідомий тип підпису «%s»\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Цією командою не можна користуватися у режимі %s.\n"
- #: g10/keyedit.c:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "Вам слід вибрати принаймні один ідентифікатор користувача.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Скористайтеся командою «%s».)\n"
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "Не можна вилучати останній ідентифікатор користувача!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Вилучити всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "Вилучити основний ключ? (y/N або т/Н) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "Вам слід вибрати лише один ключ.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "Для команди слід вказати аргумент з назвою файла\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Не вдалося відкрити «%s»: %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Помилка читання резервного ключа з «%s»: %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "Вам слід вибрати принаймні один ключ.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Справді бажаєте вилучити вибрані ключі? (y/N або т/Н) "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "Справді бажаєте вилучити цей ключ? (y/N або т/Н) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Відкликати всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "Відкликати цей ідентифікатор користувача? (y/N або т/Н) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Ви справді бажаєте відкликати весь ключ? (y/N або т/Н) "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Ви справді бажаєте відкликати позначені підключі? (y/N або т/Н) "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Ви справді бажаєте відкликати цей підключ? (y/N або т/Н) "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Не можна встановлювати довіру до власника, якщо використовується вказана "
"користувачем база даних довіри\n"
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "Встановити список переваг:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Оновити переваги для вибраних ідентифікаторів користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "Оновити параметри? (y/N або т/Н) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "Зберегти зміни? (y/N або т/Н) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "Вийти без збереження? (y/N або т/Н) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "помилка оновлення: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "Ключ не змінено, отже оновлення непотрібне.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "«%s» не є відбитком\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "«%s» не є основним відбитком\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "некоректне значення\n"
+
++#: g10/keyedit.c:3099
msgid "No matching user IDs."
msgstr "Немає відповідних ідентифікаторів користувачів."
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
msgid "Nothing to sign.\n"
msgstr "Нічого підписувати.\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "Контрольна сума: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "Можливості: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "Сервер ключів без можливості зміни"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "Основний сервер ключів: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "Примітки: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
"Переваг для ідентифікаторів користувачів у форматі PGP 2.x не передбачено.\n"
- #: g10/keyedit.c:3101
++#: g10/keyedit.c:3620
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
- #: g10/keyedit.c:3125
++#: g10/keyedit.c:3644
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Цей ключ може бути відкликано %s ключем %s"
- #: g10/keyedit.c:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(важливий)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "створено: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "відкликано: %s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "не діє з: %s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "діє до: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "використання: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "номер картки: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "надійність: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "чинність: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "Цей ключ було вимкнено"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4389,17 -3487,12 +4454,17 @@@ msgstr "
"Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
"до перезапуску програми.\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "відкликано"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "збіг строк дії"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4409,15 -3502,12 +4474,15 @@@ msgstr "
" цієї команди можна зробити основним інший ідентифікатор "
"користувача.\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "УВАГА: строк дії вашого підключа імпортування невдовзі завершиться.\n"
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
msgid "You may want to change its expiration date too.\n"
msgstr "Ймовірно, вам варто змінити також і його строк дії.\n"
- #: g10/keyedit.c:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4427,35 -3517,27 +4492,35 @@@ msgstr "
"до відмови\n"
" у використанні цього ключа деякими версіями PGP.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Ви справді бажаєте додати його? (y/N або т/Н) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
- #: g10/keyedit.c:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "Вилучити цей дійсний підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Вилучити цей некоректний підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Вилучити цей невідомий підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "Вилучити цей самопідпис? (y/N або т/Н)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4464,20 -3546,16 +4529,20 @@@ msgstr[0] "Вилучено %d підп
msgstr[1] "Вилучено %d підпис.\n"
msgstr[2] "Вилучено %d підпис.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "Нічого не вилучено.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "некоректний"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Ідентифікатор користувача «%s» ущільнено: %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4486,17 -3564,14 +4551,17 @@@ msgstr[0] "Ідентифікатор �
msgstr[1] "Ідентифікатор користувача «%s»: вилучено %d підпис\n"
msgstr[2] "Ідентифікатор користувача «%s»: вилучено %d підпис\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Ідентифікатор користувача «%s»: вже мінімізовано\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Ідентифікатор користувача «%s»: вже очищено\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4506,39 -3581,31 +4571,39 @@@ msgstr "
"призвести до відмови\n"
" у використанні цього ключа деякими версіями PGP.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Не можна додавати підписане відкликання до ключа у форматі PGP 2.x.\n"
- #: g10/keyedit.c:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "Вкажіть ідентифікатор користувача підписаного відкликання: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "не можна призначати ключ у форматі PGP 2.x підписаним відкликанням\n"
- #: g10/keyedit.c:3920
++#: g10/keyedit.c:4439
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "не можна призначати ключ власним підписаним відкликанням\n"
- #: g10/keyedit.c:3942
++#: g10/keyedit.c:4461
msgid "this key has already been designated as a revoker\n"
msgstr "цей ключ вже було позначено як призначений для відкликання\n"
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"УВАГА: призначення ключа як підписаного відкликання не можна скасовувати!\n"
- #: g10/keyedit.c:3967
++#: g10/keyedit.c:4485
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
"Н) "
- #: g10/keyedit.c:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4549,229 -3616,179 +4614,229 @@@ msgstr "
"Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
"Н) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "Зміна часу завершення строку дії для підключа.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "Зміна часу завершення строку дії для основного ключа.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Не можна змінювати дату завершення строку дії ключа v3\n"
- #: g10/keyedit.c:4144
++#: g10/keyedit.c:4768
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "підписування підключа %s вже перехресно сертифіковано\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"підключ %s не призначено для підписування, отже його не потрібно перехресно "
"сертифікувати\n"
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "Будь ласка, виберіть лише один ідентифікатор користувача.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "пропускаємо самопідпис v3 для ідентифікатора користувача «%s»\n"
- #: g10/keyedit.c:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "Вкажіть адресу вашого основного сервера ключів: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Ви справді бажаєте замінити його? (y/N або т/Н) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Ви справді бажаєте вилучити його? (y/N або т/Н) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "Вкажіть примітку: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "Продовжувати? (y/N або т/Н) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ідентифікатора користувача з індексом %d не існує\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ідентифікатора користувача з хешем %s не існує\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "Підключа з індексом %d не існує\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "Підключа з індексом %d не існує\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "Ідентифікатор користувача: «%s»\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "підписано вашим ключем %s %s%s%s\n"
- #: g10/keyedit.c:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (неекспортовний)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Строк дії цього підпису завершується %s.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Ви справді бажаєте відкликати його? (y/N або т/Н) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Створити сертифікат відкликання для цього підпису? (y/N або т/Н) "
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "Не підписано вами.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Вами підписано ці ідентифікатори користувачів у ключі %s:\n"
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (невідкликуваний)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "відкликано вашим ключем %s у %s\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "Ви маєте намір відкликати ці підписи:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "Справді створити сертифікати відкликання? (y/N або т/Н) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "немає закритого ключа\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ідентифікатор користувача «%s» вже відкликано\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"УВАГА: підпис ідентифікатора користувача позначено датою на %d секунд у "
"майбутньому\n"
- #: g10/keyedit.c:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Ключ %s вже відкликано.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Підключ %s вже відкликано.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ фотоідентифікатора %s розміру %ld для ключа %s (uid %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "запис переваги «%s» продубльовано\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "занадто багато записів переваг шифрів\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "занадто багато записів переваг контрольних сум\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "занадто багато записів переваг стискання\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "некоректний запис «%s» у рядку переваг\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "записування безпосереднього підпису\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "записування самопідпису\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "записування підпису прив’язування ключа\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "некоректний розмір ключа; використовуємо %u-бітовий\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "розмір ключа округлено до %u-бітового\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"УВАГА: деякі з програм OpenPGP не можуть працювати з ключем DSA з таким "
"розміром контрольної суми\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "Підписати"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "Сертифікувати"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "Зашифрувати"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "Пройти розпізнавання"
@@@ -4785,151 -3802,120 +4850,151 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Можливі дії з ключем %s: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "Поточні дозволені дії: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) увімкнути або вимкнути можливість підписування\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) увімкнути або вимкнути можливість шифрування\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
" (%c) увімкнути або вимкнути можливість використання для розпізнавання\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) вийти\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "Вкажіть потрібний вам тип ключа:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA і RSA (типовий)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA і Elgamal\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (лише підписування)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (лише підписування)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (лише шифрування)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (лише шифрування)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (із визначенням можливостей власноруч)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (із визначенням можливостей власноруч)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC та ECC\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (лише підписування)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (із визначенням можливостей власноруч)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (лише шифрування)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Вже записаний ключ\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "Вкажіть keygrip: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Некоректний keygrip (мало бути вказано 40 шістнадцяткових цифр)\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "Немає ключів з таким значенням keygrip\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "ключі %s можуть мати довжину від %u до %u бітів.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Якою має бути довжина підключа? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Якою має бути довжина ключа? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Запитана довжина ключа — %u бітів\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, c-format
msgid "rounded to %u bits\n"
msgstr "округлено до %u бітів\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
msgid "Please select which elliptic curve you want:\n"
msgstr "Вкажіть потрібну вам еліптичну криву:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4945,7 -3931,6 +5010,7 @@@ msgstr "
" <n>m = строк чинності у n місяців\n"
" <n>y = строк чинності у n років\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4961,38 -3946,30 +5026,38 @@@ msgstr "
" <n>m = строк чинності підпису у n місяців\n"
" <n>y = строк чинності підпису у n років\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "Яким є строк чинності ключа? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Яким є строк чинності підпису? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "некоректне значення\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "Ключ не має обмеження строку дії\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "Підпис не має обмеження строку дії\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "Ключ діє до %s\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "Підпис діє до %s\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5000,11 -3977,9 +5065,11 @@@ msgstr "
"У вашій системі неможливий показ дат після 2038 року.\n"
"Але програма коректно оброблятиме ці дати до 2106 року.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "Все правильно? (y/N або т/Н) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5019,7 -3994,6 +5084,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5036,49 -4010,38 +5101,49 @@@ msgstr "
" \"Ivan Ivanenko (farmer) <iivanenko at moyahata.ua>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "Справжнє ім’я: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "Некоректний символ у імені\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "Ім’я не може починатися з цифри\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "Ім’я має бути не коротшим за 5 літер\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "Адреса ел. пошти: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "Некоректна адреса електронної пошти\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "Коментар: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "Некоректний символ у коментарі\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Вами використано таблицю символів «%s».\n"
- #: g10/keygen.c:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5089,7 -4052,6 +5154,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Будь ласка, не використовуйте адресу електронної пошти у полях справжнього "
@@@ -5106,32 -4068,25 +5171,32 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Змінити назву (N), коментар (C), ел. пошту (E) або вийти (Q)? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2665
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Змінити назву (N), коментар (C), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
- #: g10/keygen.c:2657
++#: g10/keygen.c:2670
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Змінити назву (N), ел. пошту (E) або вийти (Q)? "
- #: g10/keygen.c:2658
++#: g10/keygen.c:2671
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Змінити назву (N), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
- #: g10/keygen.c:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "Спочатку виправте помилку\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5143,12 -4098,10 +5208,12 @@@ msgstr "
"під час створення простого числа. Це надасть змогу генератору\n"
"псевдовипадкових чисел створити краще випадкове число.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Помилка під час спроби створення ключа: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5159,64 -4112,51 +5224,64 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr "Продовжити? (Y (так)/n (ні)) "
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ключ для «%s» вже існує\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
msgid "Create anyway? (y/N) "
msgstr "Створити попри це? (y (так)/N (ні)) "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
msgid "creating anyway\n"
msgstr "створюємо попри усе\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Зауваження: скористайтеся «%s %s», щоб викликати повноцінне діалогове вікно "
"створення ключа.\n"
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "Створення ключа скасовано.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "не вдалося створити файл резервної копії «%s»: %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "ЗАУВАЖЕННЯ: резервну копію ключа на картці збережено до «%s»\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, c-format
msgid "writing public key to '%s'\n"
msgstr "записуємо відкритий ключ до «%s»\n"
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "не знайдено придатного до запису сховища відкритих ключів: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
- #: g10/keygen.c:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "відкритий і закритий ключі створено і підписано.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5224,7 -4164,6 +5289,7 @@@ msgstr "
"Зауважте, що цей ключ не може бути використано для шифрування. Ви можете\n"
"скористатися командою «--edit-key» для створення підключа з цією метою.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5232,7 -4171,6 +5297,7 @@@ msgstr "
"ключ було створено з позначкою на %lu секунд у майбутньому (часова петля або "
"проблема з годинником)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5240,47 -4178,36 +5305,47 @@@ msgstr "
"ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
- #: g10/keygen.c:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "Закриті частини основного ключа недоступні.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Закриті частини основного ключа зберігаються на картці.\n"
- #: g10/keygen.c:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "Створити? (y/N або т/Н) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "ніколи "
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "Критичні правила підпису: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "Правила підпису: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "Критичний основний сервер ключів: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "Критична примітка підпису: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "Примітка підпису: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d good signatures\n"
msgid "%d good signature\n"
@@@ -5289,7 -4216,14 +5354,16 @@@ msgstr[0] "%d добрих підпис
msgstr[1] "%d добрих підписів\n"
msgstr[2] "%d добрих підписів\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "1 підпис не перевірено через помилку\n"
+ msgstr[1] "1 підпис не перевірено через помилку\n"
+ msgstr[2] "1 підпис не перевірено через помилку\n"
+
++#: g10/keylist.c:562
#, fuzzy, c-format
#| msgid "Warning: %lu key(s) skipped due to their large size\n"
msgid "Warning: %lu key skipped due to its large size\n"
@@@ -5301,47 -4235,37 +5375,47 @@@ msgstr[1] "
msgstr[2] ""
"Попередження: %lu ключів пропущено через їхній надто великий розмір\n"
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "Сховище ключів"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "пропущено «%s»: %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "Основний відбиток ключа:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr "Відбиток основного ключа:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " Відбиток підключа:"
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " Відбиток ключа ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr "Серійний номер картки ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, c-format
msgid "caching keyring '%s'\n"
msgstr "кешування сховища ключів «%s»\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5350,7 -4274,6 +5424,7 @@@ msgstr[0] "зараз кешовано
msgstr[1] "зараз кешовано %lu ключів (%lu підписів)\n"
msgstr[2] "зараз кешовано %lu ключів (%lu підписів)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
@@@ -5359,7 -4282,6 +5433,7 @@@ msgstr[0] "спорожнити кеш
msgstr[1] "спорожнити кеш"
msgstr[2] "спорожнити кеш"
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5368,59 -4290,46 +5442,59 @@@ msgstr[0] "1 помилковий пі�
msgstr[1] "1 помилковий підпис\n"
msgstr[2] "1 помилковий підпис\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: створено сховище ключів\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr "перевизначити параметри проксі, встановлені для dirmngr"
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "включити до результатів пошуку відкликані ключі"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "включити підключі до пошуку за ідентифікатором ключа"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr "перевизначити параметри часу очікування, встановлені для dirmngr"
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "автоматично отримувати ключі під час перевірки підписів"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr "брати до уваги адресу основного сервера ключів, встановлену у ключі"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
"брати до уваги запис PKA, встановлений у ключі під час отримання ключів"
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "вимкнено"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Вкажіть номер, далі (N) чи вийти (Q) > "
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "некоректний протокол сервера ключів (наш %d!=%d обробника)\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "«%s» не є ідентифікатором ключа: пропускаємо\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5429,463 -4338,369 +5503,463 @@@ msgstr[0] "оновлюємо %d клю
msgstr[1] "оновлюємо %d ключів з %s\n"
msgstr[2] "оновлюємо %d ключів з %s\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "УВАГА: не вдалося оновити ключ %s за допомогою %s: %s\n"
- #: g10/keyserver.c:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "ключ «%s» не знайдено на сервері ключів\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "ключ не знайдено на сервері ключів\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
"не вказано жодного сервера ключів (скористайтеся параметром --keyserver)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "надсилаємо запит щодо ключа %s до %s сервера %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "надсилаємо запит щодо ключа %s з %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "invalid keyserver options\n"
msgid "no keyserver known\n"
msgstr "некоректні параметри сервера ключів\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "надсилаємо ключ %s на %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, c-format
msgid "requesting key from '%s'\n"
msgstr "надсилаємо запит щодо ключа з «%s»\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "УВАГА: не вдалося отримати адресу %s: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "дивний розмір для зашифрованого ключа сеансу (%d)\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "зашифрований %s ключ сеансу\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr ""
"пароль створено за допомогою невідомого алгоритму створення контрольних сум "
"%d\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "відкритий ключ — %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "зашифровані відкритим ключем дані: належний DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
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:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " «%s»\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "зашифровано ключем %s, ідентифікатор %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "невдала спроба розшифровування відкритим ключем: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "зашифровано за допомогою %lu паролів\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "зашифровано за допомогою 1 пароля\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "припускаємо, що дані зашифровано %s\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "Шифр IDEA недоступний, спробуємо скористатися замість нього %s\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "УВАГА: цілісність повідомлення не захищено\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "розшифровано\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "УВАГА: зашифроване повідомлення було змінено!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "невдала спроба розшифрування: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "ЗАУВАЖЕННЯ: вимога відправника: «лише для Вас»\n"
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "початкова назва файла=«%.*s»\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "УВАГА: виявлено декілька фрагментів нешифрованого тексту\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"окреме відкликання — скористайтеся командою «gpg --import» для застосування\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "підпису не знайдено\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПОМИЛКОВИЙ підпис від «%s»"
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Прострочений підпис від «%s»"
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "Належний підпис від «%s»"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "перевірку підписів придушено\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "не вдалося обробити ці дані з неоднозначним підписом\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Підпис створено %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " за допомогою %s ключа %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Підпис створено %s ключем %s з ідентифікатором %s\n"
- #: g10/mainproc.c:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "Ключ доступний на: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[непевний]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " або «%s»"
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "Строк дії підпису вичерпано %s\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "Підпис діє до %s\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s підпис, алгоритм контрольної суми %s%s%s\n"
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "двійковий"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "текстовий"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "невідомо"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
msgid ", key algorithm "
msgstr ", алгоритм ключа "
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "УВАГА: не відє’днаний підпис; файл «%s» не було перевірено!\n"
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не вдалося перевірити підпис: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "не є від’єднаним підписом\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "УВАГА: виявлено кратні підписи. Буде перевірено лише перший.\n"
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "окремий підпис класу 0x%02x\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "підпис у застарілому форматі (PGP 2.x)\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "помилка fstat щодо «%s» у %s: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "помилка fstat(%d) у %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr ""
"УВАГА: використовуємо експериментальний алгоритм створення відкритого ключа "
"%s\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr ""
"УВАГА: ключі підписування і шифрування Elgamal вважаються застарілими\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "УВАГА: використовуємо експериментальний алгоритм шифрування %s\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr ""
"УВАГА: використовуємо експериментальний алгоритм обчислення контрольних сум "
"%s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "УВАГА: алгоритм обчислення контрольних сум %s вважається застарілим\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Зауваження: підписи за допомогою алгоритму %s відкинуто\n"
- #: g10/misc.c:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "%s:%u: read error: %s\n"
msgid "(reported error: %s)\n"
msgstr "%s:%u: помилка під час читання: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in '%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "помилка читання у «%s»: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: застарілий параметр «%s»\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "УВАГА: «%s» вважається застарілим параметром\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "будь ласка, скористайтеся «%s%s»\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "УВАГА: «%s» вважається застарілою командою — не користуйтеся нею\n"
- #: g10/misc.c:1081
++#: g10/misc.c:1079
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: «%s» є застарілим у цьому файлі — він працює лише у %s\n"
- #: g10/misc.c:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "Нестиснений"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "uncompressed|немає"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "використання цього повідомлення щодо %s може бути неможливим\n"
- #: g10/misc.c:1469
++#: g10/misc.c:1467
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "неоднозначний параметр «%s»\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, c-format
msgid "unknown option '%s'\n"
msgstr "невідомий параметр «%s»\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
"Відкритий ключ ECDSA має зберігатися у кодуванні SEC кратному 8-бітовому\n"
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
#| msgid "Unknown signature type '%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "Невідомий тип підпису «%s»\n"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, c-format
msgid "File '%s' exists. "
msgstr "Файл «%s» існує. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Перезаписати? (y/N або т/Н) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: невідомий суфікс\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "Введіть нову назву файла"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "записуємо до stdout\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "припускаємо підписані дані у «%s»\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, c-format
msgid "new configuration file '%s' created\n"
msgstr "створено новий файл налаштувань «%s»\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "УВАГА: параметри у «%s» ще не є активними під час цього запуску\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "робота з алгоритмом створення відкритого ключа %d неможлива\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"УВАГА: потенційно небезпечний зашифрований симетричним алгоритмом ключ "
"сеансу\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "підпакет типу %d містить критичний набір бітів\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "проблема з агентом: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (ідентифікатор основного ключа %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -5899,15 -4714,12 +5973,15 @@@ msgstr "
"%u-бітовий ключ %s, ідентифікатор %s,\n"
"створено %s%s.\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "Вкажіть пароль\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "скасовано користувачем\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -5916,41 -4728,32 +5990,41 @@@ msgstr "
"Вам потрібен пароль для розблокування закритого ключа\n"
"для користувача: «%s»\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-бітовий ключ %s, ідентифікатор %s, створено %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (підключ у ідентифікаторі основного ключа %s)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "Вкажіть пароль для розблокування закритого ключа OpenPGP:"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "Вкажіть пароль для імпортування закритого ключа OpenPGP:"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "Вкажіть пароль для експортування закритого підключа OpenPGP:"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "Вкажіть пароль для експортування закритого ключа OpenPGP:"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "Справді хочете остаточно вилучити закритий підключ OpenPGP:"
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "Справді хочете остаточно вилучити закритий ключ OpenPGP:"
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, c-format
msgid ""
"%s\n"
@@@ -6011,31 -4806,24 +6085,31 @@@ msgstr "Це потрібна вам ф
msgid "unable to display photo ID!\n"
msgstr "показ фотоідентифікатора неможливий!\n"
- #: g10/pkclist.c:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "Причину не вказано"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "Ключ замінено"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "Ключ скомпрометовано"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "Ключ більше не використовується"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "Ідентифікатор користувача втратив чинність"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "причина відкликання: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "коментар щодо відкликання: "
@@@ -6049,54 -4837,43 +6123,54 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "Не вказано значення довіри до:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " або «%s»\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
"Наскільки ви певні, що цей ключ справді належить користувачеві з вказаним "
"іменем?\n"
- #: g10/pkclist.c:284
++#: g10/pkclist.c:283
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = не знаю або не скажу\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = НЕ довіряю\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = довіряю без обмежень\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = повернутися до головного меню\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = пропустити цей ключ\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " q = вийти\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6105,42 -4882,34 +6179,42 @@@ msgstr "
"Мінімальним рівнем довіри до цього ключа є %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "Ваше рішення? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr ""
"Ви справді хочете встановити необмежену довіру до цього ключа? (y/N або т/Н) "
- #: g10/pkclist.c:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Сертифікати, що призводять до необмеженої довіри до ключа:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
"%s: немає певності щодо належності цього ключа користувачеві з вказаним "
"іменем\n"
- #: g10/pkclist.c:441
++#: g10/pkclist.c:440
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%s: є певні свідчення належності цього ключа користувачеві з вказаним "
"іменем\n"
- #: g10/pkclist.c:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "Ймовірно, цей ключ належить користувачеві з вказаним іменем\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "Цей ключ належить нам\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6151,129 -4920,101 +6225,129 @@@ msgstr "
"відомі наслідки ваших дій, можете ствердно відповісти\n"
"на наступне питання.\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "Попри все використовувати цей ключ? (y/N або т/Н) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "УВАГА: використовуємо ненадійний ключ!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "УВАГА: цей ключ могло бути відкликано (немає ключа відкликання)\n"
- #: g10/pkclist.c:547
++#: g10/pkclist.c:562
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "УВАГА: цей ключ було відкликано відповідною особою!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "УВАГА: цей ключ було відкликано власником!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " Це може означати, що підпис було підроблено.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "УВАГА: цей підключ було відкликано його власником!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "Зауваження: цей ключ було вимкнено.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "Зауваження: перевіреною адресою автора підпису є «%s»\n"
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "Зауваження: адреса автора підпису «%s» не збігається з записом DNS\n"
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "рівень довіри змінено на FULL (повна) через коректність даних PKA\n"
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "рівень довіри змінено на NEVER (ніколи) через помилки у даних PKA\n"
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "Зауваження: строк дії цього ключа вичерпано!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "УВАГА: цей ключ не сертифіковано за допомогою надійного підпису!\n"
- #: g10/pkclist.c:633
++#: g10/pkclist.c:648
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Немає підтверджень належності підпису його власнику.\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "УВАГА: ми НЕ довіряємо цьому ключу!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " Підпис, ймовірно, є ПІДРОБКОЮ.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "УВАГА: цей ключ не сертифіковано достатньо надійними підписами!\n"
- #: g10/pkclist.c:652
++#: g10/pkclist.c:667
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Певності у належності підпису його власнику немає.\n"
- #: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: відкритий ключ вимкнено\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: відкритий ключ вже існує\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to '%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "не вдалося встановити з’єднання з «%s»: %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
#| msgid "line %d: invalid date given\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "рядок %d: вказано некоректну дату\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
#| msgid "line %d: invalid date given\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "рядок %d: вказано некоректну дату\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Вами не вказано ідентифікатора користувача. (можете скористатися «-r»)\n"
- #: g10/pkclist.c:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "Поточні отримувачі:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6281,163 -5022,127 +6355,163 @@@ msgstr "
"\n"
"Вкажіть ідентифікатор користувача. Дані слід завершити порожнім рядком: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "Немає такого ідентифікатора користувача.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: відкритий ключ вже встановлено для типового отримувача\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "Відкритий ключ вимкнено.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "пропущено: відкритий ключ вже встановлено\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "невідомий типовий отримувач «%s»\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "немає коректних адрес\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Зауваження: у ключі %s не передбачено можливості %s\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Зауваження: у ключі %s не передбачено переваг для %s\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"дані не збережено; скористайтеся для їхнього збереження параметром «--"
"output»\n"
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "Від’єднаний підпис.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "Будь ласка, вкажіть назву файла даних: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "читаємо дані з stdin...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "немає підписаних даних\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "не вдалося відкрити підписані дані «%s»\n"
- #: g10/plaintext.c:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "не вдалося відкрити підписані дані fd=%d: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "анонімний отримувач; спробуємо закритий ключ %s ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "добре, ми є анонімним отримувачем.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "застаріле кодування DEK не підтримується\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "алгоритм шифрування %d%s є невідомим або вимкненим\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "УВАГА: не виявлено алгоритму шифрування %s у перевагах отримувача\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "ЗАУВАЖЕННЯ: строк дії закритого ключа %s завершився %s\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "помилка build_packet: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "у ключа %s немає ідентифікатора користувача\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "Буде відкликано:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(Це критичний ключ відкликання)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
msgid "Secret key is not available.\n"
msgstr "Закритий ключ недоступний.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr ""
"Створити підписаний сертифікат відкликання для цього ключа? (y/N або т/Н) "
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "Призначено виведення у форматі ASCII.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "помилка make_keysig_packet: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "Створено сертифікат відкликання.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "для «%s» не знайдено ключів відкликання\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Це сертифікат відкликання для ключа OpenPGP:"
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
#, fuzzy
#| msgid ""
#| "Use it to revoke this key in case of a compromise or loss of\n"
@@@ -6456,7 -5161,6 +6530,7 @@@ msgstr "
"закритого ключа не втрачено, краще створити новий сертифікат\n"
"відкликання і вказати причину відкликання."
- #: g10/revoke.c:576
++#: g10/revoke.c:575
#, fuzzy
#| msgid ""
#| "To avoid an accidental use of this file, a colon has been inserted\n"
@@@ -6471,13 -5175,11 +6545,13 @@@ msgstr "
"дефісами нижче додано двокрапку. Вилучіть цю двокрапку у текстовому\n"
"редакторі, перш ніж скористатися цим сертифікатом відкликання."
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Створено сертифікат відкликання.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6486,22 -5188,18 +6560,22 @@@ msgstr "закритий ключ «%s�
#. 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:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Створити сертифікат відкликання для цього ключа? (y/N або т/Н) "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6521,80 -5219,64 +6595,80 @@@ msgstr "
"може зберігати дані друку, доступ до яких зможуть отримати\n"
"сторонні люди!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "Будь ласка, вкажіть причину відкликання:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "Скасувати"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Ймовірно, вам варто тут вибрати %d)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Вкажіть необов’язковий опис; завершіть його порожнім рядком:\n"
- #: g10/revoke.c:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Причина відкликання: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(Опису не надано)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Все правильно? (y/N або т/Н) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "створено слабкий ключ — повторюємо спробу\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"не вдалося створити стійкий ключ для симетричного шифрування; спроба "
"виконувалася %d разів!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "Ключ %s використовує %s недостатньо міцний (%zu-бітовий) хеш\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
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:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "УВАГА: конфлікт контрольних сум підписів у повідомленні\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "УВАГА: підписування підключа %s не є перехресно сертифікованим\n"
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "будь ласка, ознайомтеся з %s, щоб дізнатися більше\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"УВАГА: підписування підключа %s містить некоректну перехресну сертифікацію\n"
- #: g10/sig-check.c:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6603,7 -5285,6 +6677,7 @@@ msgstr[0] "відкритий ключ
msgstr[1] "відкритий ключ %s є на %lu секунду новішим за підпис\n"
msgstr[2] "відкритий ключ %s є на %lu секунду новішим за підпис\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6612,7 -5293,6 +6686,7 @@@ msgstr[0] "відкритий ключ
msgstr[1] "відкритий ключ %s є на %lu секунду новішим за підпис\n"
msgstr[2] "відкритий ключ %s є на %lu секунду новішим за підпис\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6630,7 -5310,6 +6704,7 @@@ msgstr[2] "
"ключ %s було створено з позначкою на %lu секунду у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6647,40 -5326,33 +6721,40 @@@ msgstr[2] "
"ключ %s було створено з позначкою на %lu секунду у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "ЗАУВАЖЕННЯ: строк дії ключа підпису %s завершився %s\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "ЗАУВАЖЕННЯ: ключ підпису %s було відкликано\n"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"припускаємо помилковий підпису від ключа %s через невідомий критичний біт\n"
- #: g10/sig-check.c:801
++#: g10/sig-check.c:1043
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "ключ %s: немає підключа для підпису відкликання підключа\n"
- #: g10/sig-check.c:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "ключ %s: немає підключа для підпису прив’язування підключа\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr ""
"УВАГА: не вдалося виконати %%-розгортання примітки (занадто велика). "
"Використовуємо нерозгорнутою.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
@@@ -6688,7 -5360,6 +6762,7 @@@ msgstr "
"УВАГА: не вдалося виконати %%-розгортання адреси правил (занадто велика). "
"Використовуємо нерозгорнутою.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
@@@ -6697,12 -5368,10 +6771,12 @@@ msgstr "
"УВАГА: не вдалося виконати %%-розгортання адреси основного сервера ключів "
"(занадто велика). Використовуємо нерозгорнутою.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s підпис від: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6710,42 -5379,34 +6784,42 @@@ msgstr "
"УВАГА: примусове використання алгоритму контрольних сум %s (%d) не "
"відповідає параметрам отримувача\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "підписування:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "Буде використано шифрування %s\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"ключ не було позначено як ненадійний — не можна використовувати його з "
"фіктивним RNG!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "пропущено «%s»: дублювання\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "пропущено: закритий ключ вже існує\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"це ключ Elgamal створений за допомогою PGP, цей ключ недостатньо безпечний "
"для підписування!"
- #: g10/tdbdump.c:58 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "запис щодо довіри %lu, тип %d: помилка записування: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6754,295 -5415,236 +6828,295 @@@ msgstr "
"# Список призначених значень довіри, створено %s\n"
"# (Скористайтеся «gpg --import-ownertrust» для їхнього відновлення)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, c-format
msgid "error in '%s': %s\n"
msgstr "помилка у «%s»: %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "занадто довгий рядок"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "не вистачає двокрапки"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "некоректний відбиток"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "пропущено значення довіри до власника"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "не вдалося знайти запис довіри у «%s»: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, c-format
msgid "read error in '%s': %s\n"
msgstr "помилка читання у «%s»: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: помилка синхронізації: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "не вдалося створити блокування для «%s»\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, c-format
msgid "can't lock '%s'\n"
msgstr "не вдалося заблокувати «%s»\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "запис trustdb %lu: помилка lseek: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "запис trustdb %lu: помилка запису (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "занадто велика операція trustdb\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
- #, c-format
- msgid "can't access '%s': %s\n"
- msgstr "немає доступу до «%s»: %s\n"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: каталогу не існує!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "немає доступу до «%s»: %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: не вдалося створити запис щодо версії: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: створено некоректну trustdb\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: створено trustdb\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
msgid "Note: trustdb not writable\n"
msgstr "ЗАУВАЖЕННЯ: запис до trustdb заборонено\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: некоректна trustdb\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: не вдалося створити таблицю хешів: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: помилка оновлення запису версії: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: помилка читання запису версії: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: помилка записування запису версії: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: помилка lseek: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: помилка читання (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: не є файлом trustdb\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: запис версії з номером запису %lu\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: некоректна версія файла %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: помилка під час спроби читання вільного запису: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: помилка записування запису каталогу (dir): %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: не вдалося обнулити запис: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: не вдалося додати запис: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "Помилка: trustdb пошкоджено.\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr ""
"обробка текстових рядків з довжиною, що перевищує %d символів, неможлива\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "рядок вхідних даних довший за %d символів\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "помилка під час спроби надсилання стандартних параметрів: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "непідтримуваний алгоритм: %s"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "помилка під час спроби надсилання даних: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "помилка під час спроби запису у кодуванні base64: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "помилка під час спроби ініціалізації об’єкта читання: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "помилка під час відкриття «%s»: %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "помилка під час спроби надсилання даних: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "відкритий ключ %s не знайдено: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
#| msgid "error setting OCSP target: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "помилка під час встановлення призначення за OCSP: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "помилка під час спроби отримання ідентифікатора відповідача: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "чинність: %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "помилка під час спроби отримання збережених прапорців: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7050,18 -5652,15 +7124,18 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "показати список ключів"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
@@@ -7069,7 -5668,6 +7143,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
@@@ -7078,7 -5676,6 +7152,7 @@@ msgstr[0] "показати контр�
msgstr[1] "показати контрольні суми повідомлень"
msgstr[2] "показати контрольні суми повідомлень"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
@@@ -7086,7 -5683,6 +7160,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
@@@ -7094,7 -5690,6 +7168,7 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7105,185 -5700,166 +7179,197 @@@ msgstr[2] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "помилка під час спроби створення каналу: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "показати контрольні суми повідомлень"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "помилка під час спроби надсилання даних: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "«%s» не є коректним довгим ідентифікатором ключа\n"
- #: g10/trustdb.c:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "ключ %s: прийнято як надійний ключ\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "ключ %s зустрічається у trustdb декілька разів\n"
- #: g10/trustdb.c:295
++#: g10/trustdb.c:294
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "ключ %s: немає відкритого ключа для надійного ключа — пропущено\n"
- #: g10/trustdb.c:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "ключ %s позначено як ключ з необмеженою довірою\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "запис довіри %lu, тип запиту %d: помилка читання: %s\n"
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "запис довіри %lu не належить до вказаного типу %d\n"
- #: g10/trustdb.c:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "Ви можете спробувати повторно створити trustdb за допомогою команд:\n"
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
"Якщо результат буде незадовільним, будь ласка, зверніться до підручника\n"
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
"використання невідомої моделі довіри (%d) неможливе — припускаємо модель "
"довіри %s\n"
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "використовуємо модель довіри %s\n"
@@@ -7292,7 -5867,6 +7378,7 @@@
msgid "no need for a trustdb check\n"
msgstr "потреби у перевірці trustdb немає\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "наступну перевірку trustdb призначено на %s\n"
@@@ -7342,7 -5908,6 +7428,7 @@@ msgstr "не знайдено ключ�
msgid "public key of ultimately trusted key %s not found\n"
msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7350,28 -5915,22 +7436,28 @@@ msgstr "
"глибина: %d чинність: %3d підписано: %3d надійність: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "не вдалося оновити запис версії trustdb: помилка запису: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "не визначено"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "ніколи"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "неповна"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "повна"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "безмежна"
@@@ -7383,39 -5942,30 +7469,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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr "10"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[відклик.]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[застаріл]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[невідома]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[не визн.]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[неповна ]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ повна ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[безмежна]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7425,12 -5975,10 +7511,12 @@@ msgstr "
"Будь ласка, пам’ятайте, що файл підпису (.sig або .asc)\n"
"має бути першим файлом, вказаним у командному рядку.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "у рядку вхідних даних %u занадто багато символів або не вказано LF\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "не вдалося відкрити fd %d: %s\n"
@@@ -7771,7 -6251,6 +7857,7 @@@ msgstr "|N|Початковий нов�
msgid "run in multi server mode (foreground)"
msgstr "запустити у режимі декількох серверів (основному режимі)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|встановити вказаний рівень діагностики"
@@@ -7910,9 -6359,6 +7996,9 @@@ msgstr "кількість відпов
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "помилка пошуку ключів лише з dirmngr: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "не вдалося розмістити дескриптор keyDB\n"
@@@ -8403,7 -6744,6 +8489,7 @@@ msgstr "(здається, це не з
msgid "certificate '%s' not found: %s\n"
msgstr "сертифіката «%s» не знайдено: %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "помилка під час блокування сховища ключів: %s\n"
@@@ -8427,126 -6763,96 +8513,126 @@@ msgstr "помилка під час с
msgid "no valid recipients given\n"
msgstr "не вказано коректних отримувачів\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "показати ключ зовнішніх ключів"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "показати ланцюжок сертифікації"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "імпортувати сертифікати"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "експортувати сертифікати"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "зареєструвати картку пам’яті"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "передати команду dirmngr"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "виклик gpg-protect-tool"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "створити дані, закодовані у BASE64"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "вважати вхідні дані даними у форматі PEM"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "вважати вхідні дані даними у форматі BASE64"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "вважати вхідні дані даними у двійковому форматі"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "не використовувати САС"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "перевіряти чинність за допомогою OCSP"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "кількість сертифікатів, які слід включити"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "взяти дані щодо правил з вказаного файла"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "не перевіряти правила сертифікатів"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "Надіслати запит щодо незнайдених сертифікатів видавця"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "взагалі не використовувати термінал"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "записувати журнал режиму сервера до файла"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "записувати журнал перевірки до файла"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "пакетний режим: нічого не запитувати"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "вважати відповіддю на більшість питань «так»"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "вважати відповіддю на більшість питань «ні»"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "додати сховище ключів до списку сховищ ключів"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
"|USER-ID|використовувати ідентифікатор користувача як типовий закритий ключ"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "використовувати цей сервер ключів для пошуку"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|використовувати вказаний алгоритм шифрування"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr ""
"|NAME|використовувати вказаний алгоритм обчислення контрольної суми "
"повідомлення"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "Використання: @GPGSM@ [параметри] [файли] (-h — довідка)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8557,46 -6863,37 +8643,46 @@@ msgstr "
"протоколу S/MIME\n"
"Типова дія залежатиме від вхідних даних\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "ЗАУВАЖЕННЯ: не вдасться зашифрувати до «%s»: %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "невідома модель перевірки «%s»\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: не вказано назви вузла\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: вказано пароль, але не вказано користувача\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: пропускаємо цей рядок\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "не вдалося обробити сервер ключів\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "імпортуємо загальні сертифікати «%s»\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "підписування за допомогою «%s» неможливе: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "некоректна команда (немає неявної команди)\n"
@@@ -8613,7 -6907,6 +8699,7 @@@ msgstr "помилка під час с
msgid "basic certificate checks failed - not imported\n"
msgstr "помилка під час основних перевірок сертифіката — не імпортовано\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "помилка під час спроби отримання збережених прапорців: %s\n"
@@@ -8628,31 -6919,25 +8714,31 @@@ msgstr "помилка під час с
msgid "error reading input: %s\n"
msgstr "помилка під час спроби читання вхідних даних: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "не вдалося отримати відбиток\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "проблем з пошуком вже створеного сертифіката: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "помилка під час спроби знайти придатну до запису keyDB: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "помилка під час спроби збереження сертифіката: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "проблема з повторним пошуком сертифіката: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "помилка під час спроби збереження позначок: %s\n"
@@@ -8838,7 -7090,6 +8924,7 @@@ msgstr "остаточно завант
msgid " runtime cached certificates: %u\n"
msgstr " динамічно кешовані сертифікати: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
msgid "certificate already cached\n"
msgstr "сертифікат вже кешовано\n"
@@@ -8846,8 -7096,6 +8932,8 @@@
msgid "certificate cached\n"
msgstr "сертифікат кешовано\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, c-format
msgid "error caching certificate: %s\n"
msgstr "помилка під час спроби кешування сертифіката: %s\n"
@@@ -9447,13 -7572,11 +9533,13 @@@ msgstr "сертифікати мал�
msgid "force the use of the default OCSP responder"
msgstr "примусово використовувати типовий відповідач OCSP"
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr ""
"Використання: dirmngr-client [параметри] [файл_сертифіката|шаблон] (-h — "
"довідка)\n"
- #: dirmngr/dirmngr-client.c:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9465,77 -7588,61 +9551,77 @@@ msgstr "
"Процес повертає 0, якщо сертифікат є коректним, 1 якщо він не є\n"
"коректним, інші коди для загальних помилок.\n"
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "помилка під час спроби читання сертифіката з stdin: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "помилка під час спроби читання сертифіката з «%s»: %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr "сертифікат занадто великий для використання\n"
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, c-format
msgid "can't connect to the dirmngr: %s\n"
msgstr "не вдалося встановити з’єднання з dirmngr: %s\n"
- #: dirmngr/dirmngr-client.c:327
++#: dirmngr/dirmngr-client.c:333
#, c-format
msgid "lookup failed: %s\n"
msgstr "помилка пошуку: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "спроба завантаження CRL «%s» завершилася невдало: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr "фонову службу dirmngr запущено\n"
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "не вдалося перевірити сертифікат: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
msgid "certificate is valid\n"
msgstr "сертифікат є коректним\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
msgid "certificate has been revoked\n"
msgstr "сертифікат відкликано\n"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, c-format
msgid "certificate check failed: %s\n"
msgstr "помилка під час перевірки сертифіката: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr "отримано стан: «%s»\n"
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "помилка під час спроби запису у кодуванні base64: %s\n"
- #: dirmngr/dirmngr-client.c:685
++#: dirmngr/dirmngr-client.c:702
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "непідтримуваний запит «%s»\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr "мало бути вказано абсолютний шлях до файла\n"
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr "пошук «%s»\n"
@@@ -9682,12 -7755,10 +9768,12 @@@ msgstr "використання: %s [�
msgid "colons are not allowed in the socket name\n"
msgstr "не можна використовувати двокрапки у назві сокета\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "помилка під час обробки CRL з «%s»: %s\n"
@@@ -10165,76 -8134,60 +10251,76 @@@ msgstr "Відповідачем OCSP �
msgid "OCSP responder returned an too old status\n"
msgstr "Відповідачем OCSP повернуто занадто застарілі дані щодо стану\n"
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "помилка assuan_inquire(%s): %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr "не вказано ldapserver"
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr "у ідентифікаторі сертифіката немає серійного номера"
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "помилка assuan_inquire: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "помилка fetch_cert_by_url: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, c-format
msgid "error sending data: %s\n"
msgstr "помилка під час спроби надсилання даних: %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "помилка start_cert_fetch: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "помилка fetch_next_cert: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "перевищено max_replies у %d\n"
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "не вдалося розмістити структуру керування: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "не вдалося розмістити контекст assuan: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "не вдалося ініціалізувати сервер: %s\n"
- #: dirmngr/server.c:2438
++#: dirmngr/server.c:2437
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
- #: dirmngr/server.c:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема з прийняттям Assuan: %s\n"
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "помилка обробки за допомогою Assuan: %s\n"
diff --cc po/zh_CN.po
index 2801cf0,3d5f8bc..6bff2b1
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2009-07-09 10:03+0200\n"
"Last-Translator: Meng Jie <zuxyhere at eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
@@@ -105,8 -89,6 +105,8 @@@ msgstr "请输入密码：这是一个�
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
#, fuzzy
msgid "Passphrase:"
msgstr "错误的密码"
@@@ -162,25 -133,11 +162,25 @@@ msgstr "错误的密码
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, fuzzy, c-format
#| msgid "can't create `%s': %s\n"
msgid "can't create '%s': %s\n"
msgstr "无法建立‘%s’：%s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
#, fuzzy
msgid "Please insert the card with serial number"
msgstr ""
"请取出当前的卡，并插入有下列序列号的卡：\n"
" %.*s\n"
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
#, fuzzy
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
@@@ -395,8 -313,6 +395,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "更改密码"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -406,117 -322,86 +406,117 @@@ msgstr "
"选项：\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "详细模式"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读取选项\n"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr ""
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "在公钥服务器上搜寻密钥"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "导入后不更新信任度数据库"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
msgid "|NAME|accept some commands via NAME"
msgstr "|某甲|为收件者“某甲”加密"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
#, fuzzy
msgid "allow presetting passphrase"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "未被支持"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -525,166 -410,126 +525,171 @@@ 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:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
"请向 <zuxyhere at eastday.com> 反映简体中文翻译的问题。\n"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: 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:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: 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:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:1854
++#: agent/gpg-agent.c:1858
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
- #: agent/gpg-agent.c:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 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:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败：%s\n"
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "正在将私钥写至`%s'\n"
- #: agent/gpg-agent.c:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 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:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, fuzzy, c-format
#| msgid "directory `%s' created\n"
msgid "directory '%s' created\n"
msgstr "已创建目录‘%s’\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "警告：扩展模块‘%s’权限不安全\n"
+
++#: agent/gpg-agent.c:1964
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错：%s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "无法建立目录‘%s’：%s\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s：已跳过：%s\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 tools/gpg-connect-agent.c:2239
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
@@@ -700,8 -543,6 +705,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -709,9 -550,6 +714,9 @@@ msgstr "
"@指令：\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -721,46 -559,38 +726,46 @@@ msgstr "
"选项：\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
#, fuzzy
msgid "cancelled\n"
msgstr "已取消"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
@@@ -824,8 -644,6 +829,8 @@@ msgstr "
msgid "Yes"
msgstr "yes"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr ""
@@@ -855,28 -670,23 +860,28 @@@ msgstr "
msgid "Wrong"
msgstr ""
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
#, fuzzy
msgid "Change passphrase"
msgstr "更改密码"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr ""
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -884,19 -694,16 +889,19 @@@
"%%0A?"
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
#, fuzzy
#| msgid "enable key"
msgid "Delete key"
msgstr "启用密钥"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA 需要散列值长度为 8 位的倍数\n"
@@@ -937,53 -737,42 +942,57 @@@ msgstr "保护算法 %d%s 未被支持\
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "保护算法 %d%s 未被支持\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, fuzzy, c-format
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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "读取‘%s’时出错：%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 ""
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "更新失败：%s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "读取‘%s’时出错：%s\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "读取‘%s’时出错：%s\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "读取‘%s’时出错：%s\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
+
+#: common/simple-pwquery.c:376
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
@@@ -997,17 -784,18 +1006,22 @@@ msgstr "
msgid "problem setting the gpg-agent options\n"
msgstr ""
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
#, fuzzy
msgid "canceled by user\n"
msgstr "用户取消\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
#, fuzzy
msgid "problem with the agent\n"
msgstr "代理程序有问题――正在停用代理程序\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "代理程序有问题――正在停用代理程序\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "无法禁用核心内存转储：%s\n"
@@@ -1077,17 -851,18 +1091,22 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, fuzzy, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "建立钥匙环‘%s’时发生错误：%s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, fuzzy, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1417,7 -1125,6 +1436,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
#, fuzzy
msgid "out of core\n"
msgstr "可选"
@@@ -1427,22 -1133,14 +1446,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "无效的列表选项\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "您找到一个程序缺陷了……(%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "签名时失败： %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, fuzzy, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
@@@ -1481,167 -1172,134 +1495,176 @@@ msgstr "找不到公钥 %s：%s\n
msgid "waiting for lock %s...\n"
msgstr "等待‘%s’上的锁\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "ASCII 封装：%s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "无效的 ASCII 封装头："
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "ASCII 封装头："
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "无效的明文签名头\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
#, fuzzy
msgid "unknown armor header: "
msgstr "ASCII 封装头："
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "多层明文签名\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "与预期不符的 ASCII 封装："
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "以连字符开头的行格式错误："
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "跳过无效的 64 进制字符 %02x\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "文件先于预期结束(没有 CRC 部分)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "文件先于预期结束(CRC 部分未结束)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "异常的 CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC 错误：%06lx - %06lx\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "文件先于预期结束(于结尾处)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "结尾行有问题\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "找不到有效的 OpenPGP 数据。\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, c-format
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr ""
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr ""
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr ""
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr ""
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr ""
+
++#: g10/build-packet.c:1241
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr ""
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
#, fuzzy
msgid "WARNING: invalid notation data found\n"
msgstr "找不到有效的 OpenPGP 数据。\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr ""
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "请输入密码："
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: "
msgid "WARNING: %s\n"
msgstr "警告："
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP 卡不可用：%s\n"
- #: g10/card-util.c:92 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
#, fuzzy
msgid "This command is only available for version 2 cards\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "私钥部分不可用\n"
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "您的选择？ "
@@@ -1703,21 -1347,11 +1726,16 @@@ msgstr "获取公钥的 URL：
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "错误：URL 太长(至多 %d 个字符)\n"
- #: g10/card-util.c:799 tools/no-libgcrypt.c:30
- #, fuzzy, c-format
- msgid "error allocating enough memory: %s\n"
- msgstr "建立钥匙环‘%s’时发生错误：%s\n"
-
- #: g10/card-util.c:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
@@@ -1808,13 -1423,10 +1826,13 @@@ msgstr "您想要用多大的密钥尺�
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
@@@ -1873,9 -1475,6 +1891,9 @@@ msgstr " (2) 加密密钥\n
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
@@@ -1909,7 -1502,6 +1927,7 @@@ msgstr "为其添加签名吗？(y/N)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "离开这个菜单"
@@@ -1917,7 -1508,6 +1935,7 @@@
msgid "show admin commands"
msgstr "显示管理员命令"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "显示这份在线说明"
@@@ -1993,168 -1565,131 +2011,168 @@@ msgstr "允许使用管理员命令\n
msgid "Admin commands are not allowed\n"
msgstr "不允许使用管理员命令\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "无法打开‘%s’\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到：%s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "读取密钥区块时发生错误：%s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(除非您用指纹指定密钥)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "在批处理模式中，没有“--yes”就无法这么做\n"
- #: g10/delkey.c:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "要从钥匙环里删除这把密钥吗？(y/N)"
- #: g10/delkey.c:159
++#: g10/delkey.c:158
msgid "This is a secret key! - really delete? (y/N) "
msgstr "这是一把私钥！――真的要删除吗？(y/N)"
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, fuzzy, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "bad key"
msgid "key"
msgstr "密钥已损坏"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
#, fuzzy
#| msgid "Pubkey: "
msgid "subkey"
msgstr "公钥："
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "信任度信息已被清除\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "公钥“%s”有对应的私钥！\n"
- #: g10/delkey.c:272
++#: g10/delkey.c:271
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
- #: g10/encrypt.c:226 g10/sign.c:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "使用对称加密算法 %s\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, fuzzy, c-format
#| msgid "`%s' already compressed\n"
msgid "'%s' already compressed\n"
msgstr "‘%s’已被压缩\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
msgstr "警告：‘%s’是一个空文件\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, fuzzy, c-format
#| msgid "reading from `%s'\n"
msgid "reading from '%s'\n"
msgstr "正在从‘%s’读取\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "您不该将 %s 用于 %s 模式中\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已经加密给：“%s”\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "您不该将 %s 用于 %s 模式中\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 加密过的数据\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以未知的算法 %d 加密\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "处理加密包有问题\n"
@@@ -2213,132 -1737,104 +2231,132 @@@ msgstr "警告：无法删除临时文�
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "警告：无法删除临时目录‘%s’：%s\n"
- #: g10/export.c:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "导出被标记为局部的密名"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr "导出属性用户标识(一般为照片标识)"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "导出被标记为“敏感”的吊销密钥"
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "导出时清除密钥中的不可用部分"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr "导出时尽可能清除密钥中的可选部分"
- #: g10/export.c:896
++#: g10/export.c:895
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s：已跳过：%s\n"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "不允许导出私钥\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
- #: g10/export.c:1241
++#: g10/export.c:1240
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "密钥 %s：密钥在卡上——已跳过\n"
- #: g10/export.c:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "警告：没有导出任何东西\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
msgstr "建立‘%s’时发生错误：%s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "无效的列表选项\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "‘%s’中出错：%s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "自动获取‘%s’，通过 %s\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "建立‘%s’时发生错误：%s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
#, fuzzy
msgid "No fingerprint"
msgstr "CA 指纹："
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "找不到私钥“%s”：%s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "unusable secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "不可用的私钥"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "unusable secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "不可用的私钥"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
- #: g10/getkey.c:3296
++#: g10/getkey.c:3301
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
- #: g10/gpg.c:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "|[文件名]|生成一份签名"
@@@ -2348,11 -1843,9 +2366,11 @@@
msgid "make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "生成一份分离的签名"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "加密数据"
@@@ -2360,15 -1852,12 +2378,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "验证签名"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "列出密钥"
@@@ -2380,15 -1867,12 +2398,15 @@@ msgstr "列出密钥和签名
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "列出私钥"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
@@@ -2412,7 -1892,6 +2430,7 @@@ msgstr "
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
@@@ -2444,7 -1917,6 +2462,7 @@@ msgstr "为某把密钥添加本地签�
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "更改密码"
@@@ -2494,24 -1955,19 +2512,24 @@@ msgstr "更新信任度数据库
msgid "print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|某甲|为收件者“某甲”加密"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
@@@ -2525,12 -1979,10 +2543,12 @@@ msgstr "|N|设定压缩等级为 N (0 �
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "不做任何改变"
@@@ -2542,7 -1992,6 +2560,7 @@@ msgstr "覆盖前先询问
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2550,7 -1999,6 +2568,7 @@@ msgstr "
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2570,13 -2018,11 +2588,13 @@@ msgstr "
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: g10/gpg.c:988
++#: g10/gpg.c:991
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2591,7 -2037,6 +2609,7 @@@ msgstr "
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2599,80 -2044,65 +2617,80 @@@ msgstr "
"\n"
"支持的算法：\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "公钥："
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "对称加密："
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "散列："
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "压缩："
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法：gpg [选项] "
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, 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:1507
++#: g10/gpg.c:1510
#, 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:1510
++#: g10/gpg.c:1513
#, 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:1513
++#: g10/gpg.c:1516
#, 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:1519
++#: g10/gpg.c:1522
#, 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:1522
++#: g10/gpg.c:1525
#, 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:1525
++#: g10/gpg.c:1528
#, 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:1531
++#: g10/gpg.c:1534
#, 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:1534
++#: g10/gpg.c:1537
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2680,19 -2110,16 +2698,19 @@@ msgid "
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, 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:1543
++#: g10/gpg.c:1546
#, 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:1546
++#: g10/gpg.c:1549
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2701,507 -2128,396 +2719,507 @@@ msgid "
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, 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:1756
++#: g10/gpg.c:1759
#, fuzzy, c-format
#| msgid "unknown configuration item `%s'\n"
msgid "unknown configuration item '%s'\n"
msgstr "未知的配置项‘%s’\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
#, fuzzy
#| msgid "show user ID validity during key listings"
msgid "show key usage information during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "禁用密钥"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, 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:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, 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:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, 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:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, 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:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s：%d：无效的公钥服务器选项\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s：%d：无效的导入选项\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s：%d：无效的导出选项\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s：%d：无效的列表选项\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s：%d：无效的校验选项\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s：%d：无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告：%s 会使得 %s 失效\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
- #: g10/gpg.c:3515
++#: g10/gpg.c:3522
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
- #: g10/gpg.c:3517
++#: g10/gpg.c:3524
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3527
#, 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:3524
++#: g10/gpg.c:3531
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, 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:3631
++#: g10/gpg.c:3638
#, 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:3636
++#: g10/gpg.c:3643
#, 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:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
- #: g10/gpg.c:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [文件名]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, 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:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
- #: g10/gpg.c:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [文件名]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key 用户标识"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败：%s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败：%s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败：%s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "导出密钥失败：%s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败：%s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败：%s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败：%s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败：%s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: g10/gpg.c:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[文件名]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@@ -3214,7 -2528,6 +3232,7 @@@ msgstr "从这个钥匙环里取用密�
msgid "make timestamp conflicts only a warning"
msgstr "把时间戳矛盾仅视为警告"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|把状态信息写入文件描述符 FD"
@@@ -3241,326 -2550,260 +3259,326 @@@ msgstr "没有可用的帮助
msgid "No help available for '%s'"
msgstr "‘%s’没有可用的帮助"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "导入被标记为局部的签名"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "导入时修复 PKS 公钥服务器导致的损坏"
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "导入后不更新信任度数据库"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "导入后不更新信任度数据库"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "只接受对已有密钥的更新"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "导入后清除密钥中无用的部分"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "导入后尽可能清除密钥中的可选部分"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "跳过 %d 样式的区块\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已处理 %lu 把密钥\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "合计被处理的数量：%lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " 已跳过的新密钥：%lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳过的新密钥：%lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 遗失用户标识：%lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " 已导入：%lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改变：%lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新用户标识：%lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子钥：%lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的签名：%lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的密钥吊销：%lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 读取的私钥：%lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 导入的私钥：%lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改变的私钥：%lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被导入：%lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 清除的签名：%lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 清除的用户标识：%lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, fuzzy, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”：对称加密算法 %s 对应首选项\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”：散列算法 %s 对应首选项\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”：压缩算法 %s 对应首选项\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "以避免可能的算法不匹配问题\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s：没有用户标识\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "“%s”已跳过：%s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s：PKS 子钥破损已修复\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签名所致\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s：找不到公钥：%s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s：新密钥――已跳过\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环：%s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 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:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
- #: g10/import.c:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s：公钥“%s”已导入\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s：与我们的副本不吻合\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
- #: g10/import.c:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
- #: g10/import.c:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s：“%s”一个新的用户标识\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s：“%s”1 个新的签名\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s：“%s”%d 个新的签名\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s：“%s”1 个新的子钥\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s：“%s”%d 个新的子钥\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s：“%s”未改变\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s：私钥已导入\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "已跳过：私钥已存在\n"
- #: g10/import.c:1579
++#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "找不到私钥“%s”：%s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
@@@ -3575,87 -2818,70 +3593,87 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
- #: g10/import.c:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s：“%s”吊销证书已被导入\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s：签名没有用户标识\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
- #: g10/import.c:2026
++#: g10/import.c:2025
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
- #: g10/import.c:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s：不支持的公钥算法\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "密钥 %s：已新增直接密钥签名\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s：没有可供绑定的子钥\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s：无效的子钥绑定\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s：已删除多重子钥绑定\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
- #: g10/import.c:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s：无效的子钥吊销\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s：已删除多重子钥吊销\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s：已跳过用户标识“%s”\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s：已跳过子钥\n"
@@@ -3664,111 -2890,109 +3682,134 @@@
# * 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:2234
++#: g10/import.c:2233
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
- #: g10/import.c:2245
++#: g10/import.c:2244
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
- #: g10/import.c:2263
++#: g10/import.c:2262
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
- #: g10/import.c:2285
++#: g10/import.c:2284
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
- #: g10/import.c:2414
++#: g10/import.c:2413
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
- #: g10/import.c:2478
++#: g10/import.c:2477
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
- #: g10/import.c:2494
++#: g10/import.c:2493
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
- #: g10/import.c:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s：已新增吊销证书“%s”\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s：已新增直接密钥签名\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, fuzzy, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error creating keyring '%s': %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, fuzzy, c-format
msgid "keybox '%s' created\n"
msgstr "钥匙环‘%s’已建立\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, fuzzy, c-format
#| msgid "keyring `%s' created\n"
msgid "keyring '%s' created\n"
msgstr "钥匙环‘%s’已建立\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, fuzzy, c-format
#| msgid "keyblock resource `%s': %s\n"
msgid "keyblock resource '%s': %s\n"
msgstr "密钥块资源‘%s’：%s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
msgid "error opening key DB: %s\n"
msgstr "‘%s’中出错：%s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立钥匙环缓存失败： %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[吊销]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[自身签名]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d 个损坏的签名\n"
- msgstr[1] "%d 个损坏的签名\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "密钥 %s：不支持的公钥算法\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "卡不支持散列算法 %s\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ msgid " (reordered signatures follow)"
+ msgstr "完好的签名，来自于“%s”"
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "skipped \"%s\": %s\n"
+ msgid "key %s:\n"
+ msgstr "“%s”已跳过：%s\n"
+
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "密钥 %s：“%s”%d 个签名被清除\n"
+ msgstr[1] "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
@@@ -3776,23 -3000,25 +3817,29 @@@ msgid_plural "%d signatures not checke
msgstr[0] "有 1 份签名因为遗失密钥而未被检查\n"
msgstr[1] "有 1 份签名因为遗失密钥而未被检查\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "有 1 份签名因为某个错误而未被检查\n"
- msgstr[1] "有 1 份签名因为某个错误而未被检查\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d 个损坏的签名\n"
+ msgstr[1] "%d 个损坏的签名\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "检测到 %d 个没有有效自身签名的用户标识\n"
- msgstr[1] "检测到 %d 个没有有效自身签名的用户标识\n"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "完好的签名，来自于“%s”"
+ msgstr[1] "完好的签名，来自于“%s”"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3803,17 -3029,14 +3850,17 @@@ msgstr "
"查\n"
"指纹等)？\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉强相信\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全相信\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3822,50 -3045,38 +3869,50 @@@ msgstr "
"请输入这份信任签名的深度。\n"
"深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n"
- #: g10/keyedit.c:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "请输入这份签名的限制域，如果没有请按回车。\n"
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "用户标识“%s”已被吊销。"
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "您仍然想要为它签名吗？(y/N)"
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " 无法添加签名。\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "用户标识“%s”已过期。"
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "警告：用户标识“%s”不含自身签名。"
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "可以为用户标识“%s”添加签名。"
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "为其添加签名吗？(y/N)"
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3874,65 -3085,52 +3921,65 @@@ msgstr "
"“%s”的自身签名是 PGP 2.x 样\n"
"式的签名。\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "您是否想要将它升级成 OpenPGP 的自身签名？(y/N)"
- #: g10/keyedit.c:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr "您目前为“%s”的签名已经过期了。\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "您想要发布一份新的签名来取代已过期的那一个吗？(y/N)"
- #: g10/keyedit.c:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr "您目前为“%s”的签名是一份本地签名。\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "您是否想要把它升级成可以完全导出的签名？(y/N)"
- #: g10/keyedit.c:824
++#: g10/keyedit.c:1337
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "“%s”已由密钥 %s 在本地签名\n"
- #: g10/keyedit.c:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "“%s”已由密钥 %s 签名\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "您仍然想要为它再次签名吗？(y/N)"
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "没有东西可以让密钥 %s 签名\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "这把密钥已经过期！"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "这把密钥将在 %s 过期。\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "您想要让您的签名也同时过期吗？ (Y/n) "
- #: g10/keyedit.c:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3941,33 -3139,27 +3988,33 @@@ msgstr "
"您是否谨慎地检查过，确认正要签名的密钥的确属于以上它所声称的所有者呢？\n"
"如果您不知道这个问题的答案，请输入“0”。\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答。 %s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本没有检查过。 %s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我随意检查过。 %s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地检查过。 %s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "您的选择？(输入‘?’以获得更多的信息)："
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3976,224 -3168,166 +4023,220 @@@ msgstr "
"您真的确定要签名这把密钥，使用您的密钥\n"
"“%s”(%s)\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "这将是一个自身签名。\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告：这份签名不会被标记为不可导出。\n"
- #: g10/keyedit.c:1010
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告：这份签名不会被标记成不可吊销。\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "这份签名会被标记成不可导出。\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "这份签名会被标记成不可吊销。\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "我根本没有检查过这把密钥。\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "我随意检查过这把密钥。\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地检查过这把密钥。\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "真的要签名吗？(y/N)"
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "签名时失败： %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: g10/keyedit.c:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "正在把密钥的签名移动到正确的位置去\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "保存并离开"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "显示密钥指纹"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
msgid "show the keygrip"
msgstr "输入注记："
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "列出密钥和用户标识"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "选择用户标识 N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "选择子钥 N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "检查签名"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "为所选用户标识添加本地签名"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "为所选用户标识添加信任签名"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr "为所选用户标识添加不可吊销签名"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "增加一个用户标识"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "增加一个照片标识"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "删除选定的用户标识"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "添加一个子钥"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "在智能卡上添加一把密钥"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "将一把密钥移动到智能卡上"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "将备份密钥转移到卡上"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "删除选定的子钥"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "增加一把吊销密钥"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "删除所选用户标识上的签名"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
msgid "change the expiration date for the key or selected subkeys"
msgstr "变更密钥或所选子钥的使用期限"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "将所选的用户标识设为首选用户标识"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "列出首选项(专家模式)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "列出首选项(详细模式)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "设定所选用户标识的首选项"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "设定所选用户标识的首选公钥服务器的 URL"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "为所选用户标识的设定注记"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "更改密码"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "更改信任度"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "吊销所选用户标识上的签名"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "吊销选定的用户标识"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "吊销密钥或选定的子钥"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "启用密钥"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "禁用密钥"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "显示选定的照片标识"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "压缩不可用的用户标识并删除不可用的签名"
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "压缩不可用的用户标识并删除所有签名"
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "私钥可用。\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "要有私钥才能这么做。\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4211,288 -3345,228 +4254,294 @@@ msgstr "
" 信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
" 合(ltsign、tnrsign 等)。\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "密钥已被吊销。"
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "真的为所有的用户标识签名吗？(y/N)"
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "真的为所有的用户标识签名吗？(y/N)"
- #: g10/keyedit.c:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示：选择要添加签名的用户标识\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "未知的签名类型‘%s’\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
- #: g10/keyedit.c:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "您至少得选择一个用户标识。\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "您不能删除最后一个用户标识！\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要删除所有选定的用户标识吗？(y/N)"
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "真的要删除主钥吗？(y/N)"
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "您必须指定一把密钥。\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "命令需要一个文件名作为参数\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "无法打开‘%s’：%s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, 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:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "您必须选择至少一把密钥。\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "您真的要删除这把密钥吗？(y/N)"
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要吊销这个用户标识吗？(y/N)"
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "您真的要吊销整把密钥吗？(y/N)"
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "您真的要吊销选定的子钥吗？(y/N)"
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "您真的要吊销这把子钥吗？(y/N)"
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "设为首选项列表为：\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
- #: g10/keyedit.c:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新首选项吗？(y/N)"
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "要保存变动吗？(y/N)"
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "要不保存而离开吗？(y/N)"
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "更新失败：%s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "密钥没有变动所以不需要更新。\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "指纹无效"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "无法存储指纹：%s\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "无效的数值\n"
+
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "没有这个用户标识。\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "没有东西可以让密钥 %s 签名\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "散列："
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "特点："
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "公钥服务器不可变造"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "首选公钥服务器："
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "注记："
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
- #: g10/keyedit.c:3101
++#: g10/keyedit.c:3620
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
- #: g10/keyedit.c:3125
++#: g10/keyedit.c:3644
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "这把密钥可被 %s 密钥 %s 吊销"
- #: g10/keyedit.c:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr " (敏感的)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "创建于：%s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "已吊销：%s"
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "已过期：%s"
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "有效至：%s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "可用于：%s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "卡号："
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "信任度：%s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "有效性：%s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "这把密钥已经被禁用"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "已吊销"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "已过期"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
#, 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:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4501,35 -3575,27 +4550,35 @@@ msgstr "
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗？(y/N)"
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
- #: g10/keyedit.c:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "删除这个完好的签名吗？(y/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "删除这个无效的签名吗？(y/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "删除这个未知的签名吗？(y/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要删除这个自身签名吗？(y/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4537,37 -3603,30 +4586,37 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "已经删除了 %d 个签名。\n"
msgstr[1] "已经删除了 %d 个签名。\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "没有东西被删除。\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "无效"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "用户标识“%s”：无用部分已清除\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "密钥 %s：“%s”%d 个签名被清除\n"
msgstr[1] "密钥 %s：“%s”%d 个签名被清除\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "用户标识“%s”：无用部分已清除\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "用户标识“%s”：无用部分已清除\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4576,42 -3635,34 +4625,42 @@@ msgstr "
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
- #: g10/keyedit.c:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识："
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
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:3942
++#: g10/keyedit.c:4461
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
- #: g10/keyedit.c:3967
++#: g10/keyedit.c:4485
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
- #: g10/keyedit.c:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4620,225 -3671,175 +4669,225 @@@ msgid "
"N) "
msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
- #: g10/keyedit.c:4144
++#: g10/keyedit.c:4768
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "签名的子钥 %s 已经交叉验证\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签名\n"
- #: g10/keyedit.c:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL："
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗？(y/N)"
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗？(y/N)"
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "输入注记："
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "继续？(y/N)"
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "没有散列值为 %s 的用户标识\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "没有索引为 %d 的子钥\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识：“%s”\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
- #: g10/keyedit.c:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (不可导出)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签名已在 %s 过期。\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗？(y/N)"
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (不可吊销)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签名：\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗？(y/N)"
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "没有私钥\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
- #: g10/keyedit.c:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, fuzzy, c-format
#| msgid "preference `%s' duplicated\n"
msgid "preference '%s' duplicated\n"
msgstr "首选项‘%s’重复\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "太多对称加密算法首选项\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "太多散列算法首选项\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "太多首选压缩算法\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "首选项字符串里有无效项‘%s’\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "正在写入直接签名\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "正在写入自身签名\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效：改用 %u 位\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "签名"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "验证"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "加密"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "认证"
@@@ -4852,158 -3853,127 +4901,158 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 密钥可能的操作："
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "目前允许的操作："
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 选择是否用于签名\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 选择是否用于加密\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 选择是否用于认证\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "请选择您要使用的密钥种类：\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (仅用于签名)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (仅用于签名)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (仅用于加密)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (自定义用途)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (仅用于签名)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (2) 加密密钥\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
#, fuzzy
msgid "Enter the keygrip: "
msgstr "输入注记："
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "没有索引为 %d 的子钥\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "您所要求的密钥尺寸是 %u 位\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "舍入到 %u 位\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "请选择您要使用的密钥种类：\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5019,7 -3989,6 +5068,7 @@@ msgstr "
" <n>m = 密钥在 n 月后过期\n"
" <n>y = 密钥在 n 年后过期\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5035,38 -4004,30 +5084,38 @@@ msgstr "
" <n>m = 签名在 n 月后过期\n"
" <n>y = 签名在 n 年后过期\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "密钥的有效期限是？(0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "签名的有效期限是多久？(%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "无效的数值\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "密钥永远不会过期\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "签名永远不会过期\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "密钥于 %s 过期\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "签名于 %s 过期\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5074,11 -4035,9 +5123,11 @@@ msgstr "
"您的系统无法显示 2038 年以后的日期。\n"
"不过，它可以正确处理 2106 年之前的年份。\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "以上正确吗？(y/n)"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5089,7 -4048,6 +5138,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5105,50 -4063,39 +5154,50 @@@ msgstr "
" “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "真实姓名："
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "电子邮件地址："
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "注释："
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, 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:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5159,7 -4106,6 +5208,7 @@@ msgstr "
" “%s”\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@@ -5174,35 -4120,28 +5223,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
- #: g10/keygen.c:2652
++#: g10/keygen.c:2665
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
- #: g10/keygen.c:2657
++#: g10/keygen.c:2670
#, 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:2658
++#: g10/keygen.c:2671
#, 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:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5212,12 -4151,10 +5261,12 @@@ msgstr "
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败：%s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5225,71 -4162,58 +5274,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "密钥已存在\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "无论如何还是使用这把密钥吗？(y/N)"
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "生成新密钥\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, 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:3873
++#: g10/keygen.c:3891
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "注意：卡密钥的备份已保存到‘%s’\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "正在将公钥写至`%s'\n"
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环：%s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, 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:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5297,61 -4221,48 +5346,61 @@@ msgstr "
"请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
#, 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:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
- #: g10/keygen.c:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "真的要建立吗？(y/N)"
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "永不过期"
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "关键签名策略："
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "签名策略："
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "关键首选公钥服务器："
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "关键签名注记："
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "签名注记："
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5359,56 -4270,52 +5408,64 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d 个损坏的签名\n"
msgstr[1] "%d 个损坏的签名\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "有 1 份签名因为某个错误而未被检查\n"
+ msgstr[1] "有 1 份签名因为某个错误而未被检查\n"
+
++#: g10/keylist.c:562
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "钥匙环"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "“%s”已跳过：%s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr "主钥指纹："
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " 主钥指纹："
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " 子钥指纹："
# use tty
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr "密钥指纹 ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr "卡序列号 ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, fuzzy, c-format
#| msgid "caching keyring `%s'\n"
msgid "caching keyring '%s'\n"
msgstr "缓存钥匙环‘%s’\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
@@@ -5416,14 -4323,12 +5473,14 @@@ msgid_plural "%lu keys cached so far (%
msgstr[0] "目前已缓存 %lu 把密钥(%lu 份签名)\n"
msgstr[1] "目前已缓存 %lu 把密钥(%lu 份签名)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] ""
msgstr[1] ""
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
@@@ -5431,58 -4336,45 +5488,58 @@@ msgid_plural " (%lu signatures)\n
msgstr[0] "1 个损坏的签名\n"
msgstr[1] "1 个损坏的签名\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s：钥匙环已建立\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "在搜索结果中包含已吊销的密钥"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "按钥匙号搜索时包含子钥"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "验证签名时自动下载密钥"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr "使用密钥中指定的首选公钥服务器 URL"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "获取密钥时使用密钥上的 PKA 记录"
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "已禁用"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识：跳过\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5490,465 -4382,371 +5547,465 @@@ msgid_plural "refreshing %d keys from %
msgstr[0] "%d 个密钥正从 %s 得到更新\n"
msgstr[1] "%d 个密钥正从 %s 得到更新\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
- #: g10/keyserver.c:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥“%s”\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s，从 %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "公钥服务器无动作！\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "下载密钥 %s，从 %s\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告：无法获取 URI %s：%s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "加密过的会话密钥尺寸(%d)诡异\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 加密过的会话密钥\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密码由未知的散列算法 %d 生成\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "公钥是 %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "公钥加密过的数据：完好的数据加密密钥\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
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:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " “%s”\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "由 %s 密钥加密、钥匙号为 %s\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公钥解密失败：%s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "以 %lu 个密码加密\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "以 1 个密码加密\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 为加密过的数据\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA 算法不可用，试以 %s 代替\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "警告：报文未受到完整的保护\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "解密成功\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告：加密过的报文已经变造！\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失败：%s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "注意：发件者要求您“只阅读不存盘”\n"
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始文件名 =‘%.*s’\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "未找到签名\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签名，来自于“%s”"
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签名，来自于“%s”"
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签名，来自于“%s”"
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "签名验证已被抑制\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些有歧义的签名\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "签名建立于 %s\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
- #: g10/mainproc.c:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "可用的密钥在："
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[不确定]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签名已于 %s 过期。\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签名在 %s 过期。\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, 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:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "二进制"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "文本模式"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "未知"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "未知的公钥算法"
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签名：%s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "不是一份分离的签名\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告：检测到多重签名。只检查第一个签名。\n"
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签名\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签名\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, 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:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) 在 %s 中出错：%s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "警告: 使用试验性质的公钥算法 %s\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "警告：不建议使用散列算法 %s\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "警告：使用试验性质的对称加密算法 %s\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "警告：使用试验性质的散列算法 %s\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "警告：不建议使用散列算法 %s\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, 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:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "读取‘%s’错误：%s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "读取‘%s’错误：%s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d：不建议使用该选项“%s”\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告：“%s”选项已不建议使用\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "请以“%s%s”代替\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
- #: g10/misc.c:1081
++#: g10/misc.c:1079
#, 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:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "不压缩"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "未压缩|无"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s 也许不能使用这个报文\n"
- #: g10/misc.c:1469
++#: g10/misc.c:1467
#, fuzzy, c-format
#| msgid "ambiguous option `%s'\n"
msgid "ambiguous option '%s'\n"
msgstr "有歧义的选项‘%s’\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, fuzzy, c-format
#| msgid "unknown option `%s'\n"
msgid "unknown option '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
#, 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:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "未知的签名类型‘%s’\n"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, fuzzy, c-format
#| msgid "File `%s' exists. "
msgid "File '%s' exists. "
msgstr "文件‘%s’已存在。 "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "是否覆盖？(y/N)"
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s：未知的后缀名\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "请输入新的文件名"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "正在写入到标准输出\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, fuzzy, c-format
#| msgid "assuming signed data in `%s'\n"
msgid "assuming signed data in '%s'\n"
msgstr "假定被签名的数据是‘%s’\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, fuzzy, c-format
#| msgid "new configuration file `%s' created\n"
msgid "new configuration file '%s' created\n"
msgstr "新的配置文件‘%s’已建立\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, fuzzy, c-format
#| msgid "WARNING: options in `%s' are not yet active during this run\n"
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "无法操作公钥算法 %d\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告：潜在不安全的对称加密会话密钥\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "代理程序有问题――正在停用代理程序\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (主钥匙号 %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -5961,64 -4759,52 +6018,64 @@@ msgstr "
"“%.*s”\n"
"%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "请输入密码\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "用户取消\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (主钥 %s 的子钥)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
#, fuzzy
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
#, fuzzy
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
#, fuzzy
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "请输入密码：这是一个秘密的句子 \n"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
#, fuzzy
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "您真的想要删除选定的密钥吗？(y/N)"
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, fuzzy, c-format
#| msgid "%u-bit %s key, ID %s, created %s"
msgid ""
@@@ -6075,31 -4853,24 +6132,31 @@@ msgstr "这张照片正确吗？(y/N/q)
msgid "unable to display photo ID!\n"
msgstr "无法显示照片标识！\n"
- #: g10/pkclist.c:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "未指定原因"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "密钥被替换"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "密钥已泄漏"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "密钥不再使用"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "用户标识不再有效"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "吊销原因："
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "吊销注释："
@@@ -6114,52 -4885,41 +6171,52 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "下列项目没有指定信任度：\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " 亦即“%s”\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "您是否相信这把密钥属于它所声称的持有者？\n"
- #: g10/pkclist.c:284
++#: g10/pkclist.c:283
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = 我不知道或我不作答\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = 我不相信\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = 我绝对相信\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = 回到主菜单\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = 跳过这把密钥\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " q = 退出\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -6168,37 -4928,29 +6225,37 @@@ msgstr "
"这把密钥的最小信任等级为：%s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "您的决定是什么？"
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "您真的要把这把密钥设成绝对信任？(y/N)"
- #: g10/pkclist.c:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "被绝对信任的密钥的证书：\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr "%s：没有证据表明这把密钥真的属于它所声称的持有者\n"
- #: g10/pkclist.c:441
++#: g10/pkclist.c:440
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr "%s：只有有限的证据表明这把密钥属于它所声称的持有者\n"
- #: g10/pkclist.c:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "这把密钥有可能属于它所声称的持有者\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "这把密钥是属于我们的\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -6207,128 -4959,100 +6264,128 @@@ msgstr "
"这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
"己在做什么，您可以在下一个问题回答 yes。\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "无论如何还是使用这把密钥吗？(y/N)"
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "警告：正在使用不被信任的密钥！\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n"
- #: g10/pkclist.c:547
++#: g10/pkclist.c:562
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "警告：这把密钥已经被它的持有者吊销了！\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " 这表明这个签名有可能是伪造的。\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "警告：这把子钥已经被它的持有者吊销了！\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "注意：这把密钥已经被禁用了。\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, 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:589
++#: g10/pkclist.c:604
#, 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:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "PKA 信息有效，信任级别调整到“完全”\n"
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "PKA 信息无效，信任级别调整到“从不”\n"
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "注意：这把密钥已经过期了！\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "警告：这把密钥未经受信任的签名认证！\n"
- #: g10/pkclist.c:633
++#: g10/pkclist.c:648
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " 没有证据表明这个签名属于它所声称的持有者。\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "警告：我们不信任这把密钥！\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " 这个签名很有可能是伪造的。\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n"
- #: g10/pkclist.c:652
++#: g10/pkclist.c:667
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 这份签名并不一定属于它所声称的持有者\n"
- #: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s：已跳过：%s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s：已跳过：公钥已被禁用\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳过：公钥已存在\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "无法连接至‘%s’：%s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
- #: g10/pkclist.c:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "当前收件人：\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6336,168 -5060,132 +6393,168 @@@ msgstr "
"\n"
"输入用户标识。以空白行结束："
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "没有这个用户标识。\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳过：公钥已被设为默认收件者\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "公钥被禁用。\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "已跳过：公钥已被设定\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的默认收件者“%s”\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "没有有效的地址\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "数据未被保存；请用“--output”选项来保存它们\n"
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "分离的签名。\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "请输入数据文件的名称： "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "正在从标准输入读取 ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "不含签名的数据\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, 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:735
++#: g10/plaintext.c:734
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "无法打开有签名的数据‘%s’\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "匿名收件者；正在尝试使用私钥 %s ……\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "很好，我们就是匿名收件者。\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "不支持旧式的 DEK 编码\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "对称加密算法 %d%s 未知或已停用\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "注意：收件人的首选项中找不到加密算法 %s\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, fuzzy, c-format
#| msgid "NOTE: secret key %s expired at %s\n"
msgid "Note: secret key %s expired at %s\n"
msgstr "注意：私钥 %s 已于 %s 过期\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
#, fuzzy
#| msgid "NOTE: key has been revoked"
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet 失败：%s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "将被吊销，吊销者：\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(这是一把敏感的吊销密钥)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "私钥可用。\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "已强行使用 ASCII 封装过的输出。\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet 失败： %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "已建立吊销证书。\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "没有找到“%s”的吊销密钥\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6506,20 -5194,17 +6563,20 @@@
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:576
++#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "已建立吊销证书。\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6528,22 -5213,18 +6585,22 @@@ msgstr "找不到私钥“%s”：%s\n
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6561,76 -5242,60 +6618,76 @@@ msgstr "
"小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
"人也能够看得到的地方！\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "请选择吊销的原因：\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "取消"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(也许您会想要在这里选择 %d)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "请输入描述(可选)；以空白行结束：\n"
- #: g10/revoke.c:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "吊销原因：%s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(不给定描述)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "这样可以吗？ (y/N)"
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "建立了弱密钥――正在重试\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "对称加密无法避免生成弱密钥；已经尝试 %d 次！\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, fuzzy, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, fuzzy, c-format
#| msgid "DSA key %s requires a %u bit or larger hash\n"
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr "DSA 密钥 %s 需要 %u 位或更长的散列\n"
- #: g10/sig-check.c:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "警告：签名散列值与报文不一致\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "警告：签名的子钥 %s 未经交叉验证\n"
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "请参见 %s 以得到更多信息。\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "警告：签名的子钥 %s 交叉验证无效\n"
- #: g10/sig-check.c:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
@@@ -6638,7 -5303,6 +6695,7 @@@ msgid_plural "public key %s is %lu seco
msgstr[0] "公钥 %s 在其签名后 %lu 秒生成\n"
msgstr[1] "公钥 %s 在其签名后 %lu 秒生成\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
@@@ -6646,7 -5310,6 +6703,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "公钥 %s 在其签名后 %lu 秒生成\n"
msgstr[1] "公钥 %s 在其签名后 %lu 秒生成\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6657,7 -5320,6 +6714,7 @@@ msgid_plural "
msgstr[0] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
msgstr[1] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6667,93 -5329,75 +6724,93 @@@ msgid_plural "
msgstr[0] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
msgstr[1] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, 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:335
++#: g10/sig-check.c:337
#, fuzzy, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "注意：密钥已被吊销"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
- #: g10/sig-check.c:801
++#: g10/sig-check.c:1043
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
- #: g10/sig-check.c:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr "警告：注记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 签名来自：“%s”\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "正在签名："
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "“%s”已跳过：重复\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "已跳过：私钥已存在\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
- #: g10/tdbdump.c:58 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6762,344 -5406,278 +6819,344 @@@ msgstr "
"# 已指定的信任度的清单，建立于 %s \n"
"# (请用“gpg --import-ownertrust”导入这些信任度)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error in '%s': %s\n"
msgstr "‘%s’中出错：%s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "列太长"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "冒号缺失"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "指纹无效"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "没有信任度"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, fuzzy, c-format
#| msgid "error finding trust record in `%s': %s\n"
msgid "error finding trust record in '%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "read error in '%s': %s\n"
msgstr "读取‘%s’错误：%s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "信任度数据库：同步失败：%s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, fuzzy, c-format
#| msgid "can't create lock for `%s'\n"
msgid "can't create lock for '%s'\n"
msgstr "不能为‘%s’创建锁定\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, fuzzy, c-format
#| msgid "can't lock `%s'\n"
msgid "can't lock '%s'\n"
msgstr "无法锁定‘%s’\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "信任度数据库处理量过大\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:675
+ #, c-format
+ msgid "%s: directory does not exist!\n"
+ msgstr "%s：目录不存在！\n"
+
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
#, fuzzy, c-format
#| msgid "can't access `%s': %s\n"
msgid "can't access '%s': %s\n"
msgstr "无法存取‘%s’：%s\n"
- #: g10/tdbio.c:688
- #, c-format
- msgid "%s: directory does not exist!\n"
- msgstr "%s：目录不存在！\n"
-
- #: g10/tdbio.c:711
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s：建立版本记录失败：%s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s：建立了无效的信任度数据库\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s：建立了信任度数据库\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "注意：信任度数据库不可写入\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s：无效的信任度数据库\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s：建立散列表失败：%s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s：更新版本记录时出错： %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s：读取版本记录时出错： %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s：写入版本记录时出错：%s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信任度数据库：lseek 失败：%s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信任度数据库：read 失败(n=%d)：%s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s：不是一个信任度数据库文件\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s：记录编号为%lu的版本记录\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s：无效的文件版本%d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s：读取自由记录时出错：%s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s：写入目录记录时出错：%s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s：记录归零时失败：%s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s：附加记录时失败：%s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s：建立了信任度数据库\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "无法处理长于 %d 字符的文本行\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "输入行长度超过 %d 字符\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
msgid "unsupported TOFU database version: %s\n"
msgstr ""
"\n"
"支持的算法：\n"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing secret keyring `%s': %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "%s: error writing dir record: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "%s：写入目录记录时出错：%s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
msgid "error opening TOFU database '%s': %s\n"
msgstr "‘%s’中出错：%s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "找不到公钥 %s：%s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting new PIN: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "有效性：%s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
msgid "error gathering signature stats: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "列出密钥"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7109,173 -5687,153 +7166,184 @@@ msgstr[1] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
msgid "error changing TOFU policy: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, 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:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "密钥 %s：受信任，已接受\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "密钥 %s 在信任度数据库中重复出现\n"
- #: g10/trustdb.c:295
++#: g10/trustdb.c:294
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "密钥 %s：受信任的密钥没有公钥――已跳过\n"
- #: g10/trustdb.c:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "密钥 %s 被标记为绝对信任\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n"
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
- #: g10/trustdb.c:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr ""
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "使用 %s 信任模型\n"
@@@ -7284,7 -5841,6 +7352,7 @@@
msgid "no need for a trustdb check\n"
msgstr "不需要检查信任度数据库\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任度数据库检查将于 %s 进行\n"
@@@ -7334,35 -5882,28 +7402,35 @@@ msgstr "没有找到任何绝对信任�
msgid "public key of ultimately trusted key %s not found\n"
msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, 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:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr "未定义"
- #: g10/trust.c:107
++#: g10/trust.c:106
msgid "never"
msgstr "从不"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr "勉强"
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr "完全"
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr "绝对"
@@@ -7374,41 -5915,32 +7442,41 @@@
#. 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
++#: g10/trust.c:146
#, 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"
- #: g10/trust.c:150
++#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[已吊销]"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
msgstr "[已过期]"
- #: g10/trust.c:157
++#: g10/trust.c:156
msgid "[ unknown]"
msgstr "[ 未知 ]"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr "[未定义]"
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr "[ 勉强 ]"
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr "[ 完全 ]"
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr "[ 绝对 ]"
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7418,12 -5950,10 +7486,12 @@@ msgstr "
"请记住签名文件(.sig或.asc)\n"
"应该是在命令行中给定的第一个文件。\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, fuzzy, c-format
msgid "can't open fd %d: %s\n"
msgstr "无法打开‘%s’： %s\n"
@@@ -7752,7 -6214,6 +7820,7 @@@ msgstr "新的 PIN
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@@ -7893,9 -6324,6 +7961,9 @@@ msgstr "生成密码的时候发生错�
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "无法读出公钥：%s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
#, fuzzy
msgid "failed to allocate keyDB handle\n"
msgstr "无法存储密钥：%s\n"
@@@ -8407,7 -6730,6 +8475,7 @@@ msgstr "
msgid "certificate '%s' not found: %s\n"
msgstr "找不到私钥“%s”：%s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "读取密钥区块时发生错误：%s\n"
@@@ -8432,135 -6750,105 +8500,135 @@@ msgstr "删除密钥区块时失败：%
msgid "no valid recipients given\n"
msgstr "(不给定描述)\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
#, fuzzy
msgid "list external keys"
msgstr "列出私钥"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
#, fuzzy
msgid "list certificate chain"
msgstr "证书已损坏"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
#, fuzzy
msgid "import certificates"
msgstr "证书已损坏"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
#, fuzzy
msgid "export certificates"
msgstr "证书已损坏"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
#, fuzzy
msgid "register a smartcard"
msgstr "在智能卡上添加一把密钥"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr ""
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr ""
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
#, fuzzy
msgid "create base-64 encoded output"
msgstr "输出经 ASCII 封装"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr ""
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr ""
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr ""
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr ""
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr ""
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr ""
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr ""
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr ""
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr ""
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr ""
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr ""
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "从‘%s’读取选项\n"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr ""
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr ""
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr ""
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "从这个钥匙环里取用密钥"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "未知的对称加密算法"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s 签名，散列算法 %s\n"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
#, fuzzy
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
@@@ -8571,47 -6859,38 +8639,47 @@@ msgstr "
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, fuzzy, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "无法连接至‘%s’：%s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, fuzzy, c-format
msgid "unknown validation model '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(不给定描述)\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = 跳过这把密钥\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "无法解析公钥服务器 URL\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "无法存取‘%s’：%s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -8629,7 -6905,6 +8697,7 @@@ msgstr "生成一份吊销证书
msgid "basic certificate checks failed - not imported\n"
msgstr ""
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
@@@ -8644,32 -6917,26 +8712,32 @@@ msgstr "生成密码的时候发生错�
msgid "error reading input: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "无法存储指纹：%s\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -8846,7 -7080,6 +8914,7 @@@ msgstr "证书已损坏
msgid " runtime cached certificates: %u\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
#, fuzzy
msgid "certificate already cached\n"
msgstr "已建立吊销证书。\n"
@@@ -8856,8 -7088,6 +8924,8 @@@
msgid "certificate cached\n"
msgstr "首选项‘%s’重复\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, fuzzy, c-format
msgid "error caching certificate: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
@@@ -9470,13 -7577,11 +9538,13 @@@ msgstr "证书已损坏
msgid "force the use of the default OCSP responder"
msgstr "输入指定吊销者的用户标识："
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
#, 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:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9484,86 -7589,70 +9552,86 @@@
"not valid and other error codes for general failures\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, fuzzy, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, fuzzy, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, 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
++#: dirmngr/dirmngr-client.c:333
#, fuzzy, c-format
#| msgid "update failed: %s\n"
msgid "lookup failed: %s\n"
msgstr "更新失败：%s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, 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:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, fuzzy, c-format
msgid "validation of certificate failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
#, fuzzy
msgid "certificate is valid\n"
msgstr "首选项‘%s’重复\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
#, fuzzy
msgid "certificate has been revoked\n"
msgstr "注意：密钥已被吊销"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, fuzzy, c-format
msgid "certificate check failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, fuzzy, c-format
#| msgid "can't stat `%s': %s\n"
msgid "got status: '%s'\n"
msgstr "无法获得文件‘%s’的信息： %s\n"
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, 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:685
++#: dirmngr/dirmngr-client.c:702
#, fuzzy, c-format
msgid "unsupported inquiry '%s'\n"
msgstr ""
"\n"
"支持的算法：\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr ""
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr ""
@@@ -9719,13 -7774,11 +9787,13 @@@ msgstr "用法：gpg [选项]
msgid "colons are not allowed in the socket name\n"
msgstr "%s 不可与 %s 并用\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, 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:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
@@@ -10231,78 -8182,62 +10299,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "签名时失败： %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "签名时失败： %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s：建立散列表失败：%s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, 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:2438
++#: dirmngr/server.c:2437
#, 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:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
diff --cc po/zh_TW.po
index 7cf28b6,22aebfa..41bec16
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: GNU gnupg 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-01-26 13:55+0100\n"
++"POT-Creation-Date: 2016-05-04 15:58+0200\n"
"PO-Revision-Date: 2014-11-22 20:56+0800\n"
"Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@@ -112,8 -96,6 +112,8 @@@ msgstr "請輸入你的密語以便在�
msgid "PIN:"
msgstr ""
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
- #: agent/protect-tool.c:704 tools/symcryptrun.c:443
++#: agent/protect-tool.c:726 tools/symcryptrun.c:443
msgid "Passphrase:"
msgstr "密語:"
@@@ -163,24 -134,10 +163,24 @@@ msgstr "不良的密語
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
+#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1256 g10/keygen.c:4008 g10/keyring.c:1327
- #: g10/keyring.c:1656 g10/openfile.c:298 g10/openfile.c:425 g10/sign.c:812
- #: g10/sign.c:1114 g10/tdbio.c:702
++#: g10/exec.c:484 g10/gpg.c:1259 g10/keygen.c:4026 g10/keyring.c:1326
++#: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:811
++#: g10/sign.c:1113 g10/tdbio.c:708
#, c-format
msgid "can't create '%s': %s\n"
msgstr "無法建立 '%s': %s\n"
+#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
- #: 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:545 g10/gpg.c:1257
- #: g10/import.c:223 g10/import.c:396 g10/keygen.c:3242 g10/keyring.c:1682
- #: g10/openfile.c:202 g10/openfile.c:216 g10/openfile.c:406
- #: g10/plaintext.c:626 g10/sign.c:794 g10/sign.c:994 g10/sign.c:1098
- #: g10/sign.c:1243 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
++#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1260
++#: g10/import.c:222 g10/import.c:395 g10/keygen.c:3255 g10/keyring.c:1681
++#: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:625 g10/sign.c:793 g10/sign.c:993 g10/sign.c:1097
++#: g10/sign.c:1242 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:713
++#: g10/tdbio.c:784 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2144
++#: sm/gpgsm.c:2174 sm/gpgsm.c:2212 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 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:1270
++#: agent/divert-scd.c:92 g10/call-agent.c:1269
msgid "Please insert the card with serial number"
msgstr "請插入下列序號的卡片:"
- #: agent/divert-scd.c:93 g10/call-agent.c:1271
++#: agent/divert-scd.c:93 g10/call-agent.c:1270
msgid "Please remove the current card and insert the one with serial number"
msgstr "請移除現用中的卡片並插入下列序號的卡片:"
@@@ -378,8 -296,6 +378,8 @@@ msgstr "請輸入密語至%0A以保護�
msgid "Please enter the new passphrase"
msgstr "請輸入新的密語"
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:74 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:74 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -387,132 -303,94 +387,132 @@@ msgstr "
"@選項:\n"
" "
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
msgstr "以服務模式執行 (背景)"
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
msgstr "以伺服器模式執行 (前景)"
- #: agent/gpg-agent.c:152 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:293 dirmngr/dirmngr-client.c:69
++#: agent/gpg-agent.c:153 g10/gpg.c:541 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:85 tools/symcryptrun.c:166
msgid "verbose"
msgstr "囉唆模式"
- #: agent/gpg-agent.c:153 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
++#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "盡量安靜些"
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
++#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
msgstr "sh 樣式的指令輸出"
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
++#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
msgstr "csh 樣式的指令輸出"
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:324
++#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
msgstr "|檔案|從指定檔案中讀取選項"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "不要從 console 分離"
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
msgstr "不要奪取鍵盤及滑鼠"
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
msgstr "為伺服器使用日誌檔"
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "不要使用 SCdaemon"
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:181
#, fuzzy
#| msgid "|NAME|connect to host NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|名稱|連線至位於指定名稱的主機"
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "忽略變更 TTY 的要求"
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
msgstr "忽略變更 X display 的要求"
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:218
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "不允許重複使用舊密語"
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
msgstr "不允許用戶端將金鑰標記為 \"已信任\""
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
msgstr "允許預先設定密語"
- #: agent/gpg-agent.c:224
- msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:225
+ msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:226
++#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:228
++#: agent/gpg-agent.c:230
msgid "enable ssh support"
msgstr "啟用 ssh 支援"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "enable putty support"
msgstr "啟用 putty 支援"
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:471 agent/preset-passphrase.c:96 agent/protect-tool.c:148
- #: g10/gpg.c:963 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
++#: agent/gpg-agent.c:473 agent/preset-passphrase.c:96 agent/protect-tool.c:152
++#: g10/gpg.c:966 g10/gpgv.c:116 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 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"
- #: agent/gpg-agent.c:480
++#: agent/gpg-agent.c:482
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
- #: agent/gpg-agent.c:482
++#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -520,137 -398,105 +520,143 @@@ msgstr "
"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
"@GNUPG@ 私鑰管理\n"
- #: agent/gpg-agent.c:528 g10/gpg.c:1154 scd/scdaemon.c:346 sm/gpgsm.c:704
++#: agent/gpg-agent.c:530 g10/gpg.c:1157 scd/scdaemon.c:346 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "給定的除錯等級 '%s' 無效\n"
- #: agent/gpg-agent.c:777 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
++#: agent/gpg-agent.c:781 agent/protect-tool.c:572 g10/gpgv.c:159
++#: kbx/kbxutil.c:467 scd/scdaemon.c:438 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: 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:895 g10/gpg.c:2362 scd/scdaemon.c:519 sm/gpgsm.c:1041
++#: agent/gpg-agent.c:899 g10/gpg.c:2365 scd/scdaemon.c:519 sm/gpgsm.c:1046
+#: dirmngr/dirmngr.c:895
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "請注意: 沒有預設選項檔 '%s'\n"
- #: agent/gpg-agent.c:906 agent/gpg-agent.c:1662 g10/gpg.c:2366
- #: scd/scdaemon.c:524 sm/gpgsm.c:1045 dirmngr/dirmngr.c:900
++#: agent/gpg-agent.c:910 agent/gpg-agent.c:1666 g10/gpg.c:2369
++#: scd/scdaemon.c:524 sm/gpgsm.c:1050 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:914 g10/gpg.c:2373 scd/scdaemon.c:532 sm/gpgsm.c:1052
++#: agent/gpg-agent.c:918 g10/gpg.c:2376 scd/scdaemon.c:532 sm/gpgsm.c:1057
+#: dirmngr/dirmngr.c:908
#, c-format
msgid "reading options from '%s'\n"
msgstr "從 '%s' 讀取選項中\n"
- #: agent/gpg-agent.c:1038 g10/gpg.c:3433 scd/scdaemon.c:652 sm/gpgsm.c:1517
++#: agent/gpg-agent.c:1042 g10/gpg.c:3440 scd/scdaemon.c:652 sm/gpgsm.c:1534
+#: 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:1799 scd/scdaemon.c:1078 dirmngr/dirmngr.c:1131
++#: agent/gpg-agent.c:1803 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:1816 scd/scdaemon.c:1091 dirmngr/dirmngr.c:1144
++#: agent/gpg-agent.c:1820 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:1854
++#: agent/gpg-agent.c:1858
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
- #: agent/gpg-agent.c:1864 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
++#: agent/gpg-agent.c:1868 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1176
msgid "error getting nonce for the socket\n"
msgstr "為 socket 取得 nonce 時出錯\n"
- #: agent/gpg-agent.c:1869 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1179
++#: agent/gpg-agent.c:1873 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:1880 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
++#: agent/gpg-agent.c:1884 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1189
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() 失敗: %s\n"
- #: agent/gpg-agent.c:1887 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
++#: agent/gpg-agent.c:1891 scd/scdaemon.c:1134 dirmngr/dirmngr.c:1195
#, c-format
msgid "listening on socket '%s'\n"
msgstr "正在候聽 socket '%s'\n"
- #: agent/gpg-agent.c:1906 agent/gpg-agent.c:1945 g10/exec.c:199
- #: g10/openfile.c:489 g10/openfile.c:518 g10/tofu.c:840 sm/keydb.c:97
++#: agent/gpg-agent.c:1910 agent/gpg-agent.c:1953 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:902 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
msgstr "無法建立目錄 '%s': %s\n"
- #: agent/gpg-agent.c:1909 agent/gpg-agent.c:1950 g10/openfile.c:492
- #: g10/openfile.c:521 sm/keydb.c:100
++#: agent/gpg-agent.c:1913 agent/gpg-agent.c:1958 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
msgstr "目錄 '%s' 已建立\n"
- #: agent/gpg-agent.c:1956
++#: agent/gpg-agent.c:1916
+ #, fuzzy, c-format
+ #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
+
++#: agent/gpg-agent.c:1964
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "'%s' 的 stat() 失敗: %s\n"
- #: agent/gpg-agent.c:1960
++#: agent/gpg-agent.c:1968
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "無法使用 '%s' 做為家目錄\n"
- #: agent/gpg-agent.c:2103 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1966
++#: agent/gpg-agent.c:2111 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:2309
++#: agent/gpg-agent.c:2317
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
- #: agent/gpg-agent.c:2314
++#: agent/gpg-agent.c:2322
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2395
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2400
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
- #: agent/gpg-agent.c:2560 scd/scdaemon.c:1273 dirmngr/dirmngr.c:2097
++#: agent/gpg-agent.c:2568 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:2623 scd/scdaemon.c:1323
++#: agent/gpg-agent.c:2631 scd/scdaemon.c:1323
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 已停止\n"
- #: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:320
- #: sm/call-agent.c:143 tools/gpg-connect-agent.c:2239
++#: agent/gpg-agent.c:2769 common/simple-pwquery.c:330 g10/call-agent.c:319
++#: sm/call-agent.c:150 tools/gpg-connect-agent.c:2239
msgid "no gpg-agent running in this session\n"
msgstr "在此階段中沒有執行中的 gpg-agent\n"
@@@ -666,8 -510,6 +672,8 @@@ msgstr "
"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
"密碼快取維護\n"
- #: agent/protect-tool.c:105 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:193
++#: agent/protect-tool.c:107 g10/gpg.c:404 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:63
msgid ""
"@Commands:\n"
" "
@@@ -675,9 -517,6 +681,9 @@@ msgstr "
"@指令:\n"
" "
- #: agent/protect-tool.c:114 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:239 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
++#: agent/protect-tool.c:116 g10/gpg.c:491 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:82 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -687,11 -526,9 +693,11 @@@ msgstr "
"選項:\n"
" "
- #: agent/protect-tool.c:151
++#: agent/protect-tool.c:155
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "用法: gpg-protect-tool [選項] (或用 -h 求助)\n"
- #: agent/protect-tool.c:153
++#: agent/protect-tool.c:157
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
@@@ -699,21 -536,17 +705,21 @@@ msgstr "
"語法: gpg-protect-tool [選項] [引數]\n"
"私鑰維護工具\n"
- #: agent/protect-tool.c:683
++#: agent/protect-tool.c:705
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "請輸入密語來取消 PKCS#12 物件的保護."
- #: agent/protect-tool.c:688
++#: agent/protect-tool.c:710
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "請輸入密語來保護新的 PKCS#12 物件."
- #: agent/protect-tool.c:694
++#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
- #: agent/protect-tool.c:699
++#: agent/protect-tool.c:721
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
@@@ -721,11 -554,9 +727,11 @@@ msgstr "
"請輸入完成這項操作所需的\n"
"密語或個人識別碼 (PIN)."
- #: agent/protect-tool.c:710 tools/symcryptrun.c:454
++#: agent/protect-tool.c:732 tools/symcryptrun.c:454
msgid "cancelled\n"
msgstr "已取消\n"
- #: agent/protect-tool.c:712 tools/symcryptrun.c:450
++#: agent/protect-tool.c:734 tools/symcryptrun.c:450
#, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "詢問密語時出錯: %s\n"
@@@ -788,8 -609,6 +794,8 @@@ msgstr "請問你是否徹底信任%%0
msgid "Yes"
msgstr "Yes"
- #: agent/trustlist.c:663 agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/trustlist.c:663 agent/findkey.c:1449 agent/findkey.c:1463
+#: common/audit.c:469
msgid "No"
msgstr "No"
@@@ -819,27 -635,22 +825,27 @@@ msgstr "正確
msgid "Wrong"
msgstr "錯了"
- #: agent/findkey.c:137
++#: agent/findkey.c:251
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr "請注意: 密語從未變更過.%0A請現在就變更."
- #: agent/findkey.c:153
++#: agent/findkey.c:267
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr "密語從下列時刻起就沒有變更過:%%0A%.4s-%.2s-%.2s. 請現在就變更."
- #: agent/findkey.c:167 agent/findkey.c:174
++#: agent/findkey.c:281 agent/findkey.c:288
msgid "Change passphrase"
msgstr "更改密語"
- #: agent/findkey.c:175
++#: agent/findkey.c:289
msgid "I'll change it later"
msgstr "我稍後再變更"
- #: agent/findkey.c:1266
++#: agent/findkey.c:1425
#, fuzzy, c-format
#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid ""
@@@ -847,11 -658,9 +853,11 @@@
"%%0A?"
msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
- #: agent/findkey.c:1290 agent/findkey.c:1304
++#: agent/findkey.c:1449 agent/findkey.c:1463
msgid "Delete key"
msgstr "刪除金鑰"
- #: agent/findkey.c:1301
++#: agent/findkey.c:1460
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@@ -859,7 -668,6 +865,7 @@@ msgstr "
"警告: 這把金鑰同時列為 SSH 所使用!\n"
"刪除這把金鑰可能會讓你失去存取遠端機器的能力."
- #: agent/pksign.c:176 g10/seskey.c:285 sm/certcheck.c:85
++#: agent/pksign.c:176 g10/seskey.c:290 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
@@@ -897,53 -698,43 +903,58 @@@ msgstr "保護演算法 %d (%s) 未支�
msgid "protection hash algorithm %d (%s) is not supported\n"
msgstr "保護雜湊演算法 %d (%s) 未支援\n"
- #: common/exechelp-posix.c:324 common/exechelp-w32.c:391
- #: common/exechelp-w32.c:415 common/exechelp-w32.c:445
++#: common/exechelp-posix.c:333 common/exechelp-w32.c:396
++#: common/exechelp-w32.c:420 common/exechelp-w32.c:450
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "建立管道時出錯: %s\n"
- #: common/exechelp-posix.c:337 common/exechelp-w32.c:401
- #: common/exechelp-w32.c:425 common/exechelp-w32.c:455
++#: common/exechelp-posix.c:346 common/exechelp-w32.c:406
++#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
#, c-format
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:1213
++#: common/exechelp-posix.c:436 common/exechelp-posix.c:509
++#: common/exechelp-posix.c:649 dirmngr/dirmngr.c:1213
#, c-format
msgid "error forking process: %s\n"
msgstr "衍生執行程序時出錯: %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"
++#: common/exechelp-posix.c:565 common/exechelp-w32.c:724
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
msgstr "等候 %d 處理程序終止時失敗: %s\n"
- #: common/exechelp-posix.c:548
++#: common/exechelp-posix.c:589
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
- #: common/exechelp-posix.c:554 common/exechelp-w32.c:716
- #: common/exechelp-w32ce.c:765
++#: common/exechelp-posix.c:596 common/exechelp-w32.c:743
++#: common/exechelp-w32ce.c:774
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
- #: common/exechelp-posix.c:562
++#: common/exechelp-posix.c:604
#, c-format
msgid "error running '%s': terminated\n"
msgstr "執行 '%s' 時出錯: 已終止\n"
- #: common/exechelp-w32.c:710 common/exechelp-w32ce.c:759
++#: common/exechelp-w32.c:736 common/exechelp-w32ce.c:768
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
++#: common/exechelp-w32ce.c:760
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "等候 %d 處理程序終止時失敗: %s\n"
+
+#: common/simple-pwquery.c:376
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "無法連接至 '%s': %s\n"
@@@ -956,15 -745,17 +967,21 @@@ msgstr "與 gpg-agent 的溝通問題\n
msgid "problem setting the gpg-agent options\n"
msgstr "設定 gpg-agent 選項時發生問題\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:656
++#: common/simple-pwquery.c:560 common/simple-pwquery.c:665
msgid "canceled by user\n"
msgstr "由使用者取消\n"
- #: common/simple-pwquery.c:575 common/simple-pwquery.c:662
++#: common/simple-pwquery.c:575
msgid "problem with the agent\n"
msgstr "代理程式的問題\n"
++#: common/simple-pwquery.c:697
+ #, fuzzy, c-format
+ #| msgid "problem with the agent: %s\n"
+ msgid "problem with the agent (unexpected response \"%s\")\n"
+ msgstr "代理程式的問題: %s\n"
+
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "無法讓系統停止傾印核心檔: %s\n"
@@@ -1034,17 -811,18 +1051,22 @@@ msgstr "在安全記憶體配置 %lu �
msgid "out of core while allocating %lu bytes"
msgstr "配置 %lu 位元組時超出核心"
- #: common/miscellaneous.c:132
++#: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
+ #, c-format
+ msgid "error allocating enough memory: %s\n"
+ msgstr "配置足夠的記憶體時出錯: %s\n"
+
++#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
- #: common/miscellaneous.c:135
++#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
- #: common/miscellaneous.c:479
++#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1337,7 -1048,6 +1359,7 @@@ msgstr "\"%.50s\" 選項不明確\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "\"%.50s\" 指令不明確\n"
- #: common/argparse.c:401 g10/tofu.c:1619 dirmngr/dirmngr.c:1231
++#: common/argparse.c:401 g10/tofu.c:1660 dirmngr/dirmngr.c:1231
msgid "out of core\n"
msgstr "超出核心\n"
@@@ -1346,22 -1055,14 +1368,17 @@@
msgid "invalid option \"%.50s\"\n"
msgstr "無效的選項 \"%.50s\"\n"
- #: common/logging.c:933
- #, c-format
- msgid "you found a bug ... (%s:%d)\n"
- msgstr "你找到一個瑕疵了 ... (%s:%d)\n"
-
- #: common/utf8conv.c:116
++#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "沒有從 '%s' 到 '%s' 之間的轉換可用\n"
- #: common/utf8conv.c:124
++#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open 失敗: %s\n"
- #: common/utf8conv.c:378 common/utf8conv.c:644
++#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
msgstr "從 '%s' 轉換到 '%s' 失敗: %s\n"
@@@ -1400,163 -1094,137 +1417,179 @@@ msgstr "未鎖定 '%s': %s\n
msgid "waiting for lock %s...\n"
msgstr "正在等候 `%s' 鎖定...\n"
- #: g10/armor.c:377
++#: g10/armor.c:417
#, c-format
msgid "armor: %s\n"
msgstr "封裝: %s\n"
- #: g10/armor.c:416
++#: g10/armor.c:456
msgid "invalid armor header: "
msgstr "無效的封裝檔頭: "
- #: g10/armor.c:427
++#: g10/armor.c:467
msgid "armor header: "
msgstr "封裝檔頭: "
- #: g10/armor.c:440
++#: g10/armor.c:480
msgid "invalid clearsig header\n"
msgstr "無效的明文簽章檔頭\n"
- #: g10/armor.c:453
++#: g10/armor.c:493
msgid "unknown armor header: "
msgstr "未知的封裝檔頭: "
- #: g10/armor.c:506
++#: g10/armor.c:546
msgid "nested clear text signatures\n"
msgstr "多層明文簽章\n"
- #: g10/armor.c:641
++#: g10/armor.c:681
msgid "unexpected armor: "
msgstr "未預期的封裝: "
- #: g10/armor.c:654
++#: g10/armor.c:694
msgid "invalid dash escaped line: "
msgstr "無效的破折號逸出列: "
- #: g10/armor.c:808 g10/armor.c:1424
++#: g10/armor.c:866 g10/armor.c:1482
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "無效的 64 進位字符 %02x 已跳過\n"
- #: g10/armor.c:851
++#: g10/armor.c:909
msgid "premature eof (no CRC)\n"
msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
- #: g10/armor.c:885
++#: g10/armor.c:943
msgid "premature eof (in CRC)\n"
msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
- #: g10/armor.c:893
++#: g10/armor.c:951
msgid "malformed CRC\n"
msgstr "格式不對的 CRC\n"
- #: g10/armor.c:897 g10/armor.c:1461
++#: g10/armor.c:955 g10/armor.c:1519
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC 錯誤; %06lX - %06lX\n"
- #: g10/armor.c:917
++#: g10/armor.c:975
msgid "premature eof (in trailer)\n"
msgstr "檔案未預期的結束 (於結尾處)\n"
- #: g10/armor.c:921
++#: g10/armor.c:979
msgid "error in trailer line\n"
msgstr "結尾列有問題\n"
- #: g10/armor.c:1238
++#: g10/armor.c:1296
msgid "no valid OpenPGP data found.\n"
msgstr "找不到有效的 OpenPGP 資料.\n"
- #: g10/armor.c:1243
++#: g10/armor.c:1301
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "無效的封裝: 列長超出 %d 字符\n"
- #: g10/armor.c:1247
++#: g10/armor.c:1305
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
- #: g10/build-packet.c:985
++#: g10/build-packet.c:1091
+ #, fuzzy, c-format
+ #| msgid "not human readable"
+ msgid "[ not human readable (%zu bytes: %s%s) ]"
+ msgstr "不是人類能讀得懂的"
+
++#: g10/build-packet.c:1143
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
- #: g10/build-packet.c:997
++#: g10/build-packet.c:1155 g10/build-packet.c:1251
msgid "a user notation name must contain the '@' character\n"
msgstr "使用者標記名稱一定要含有 '@' 字符\n"
- #: g10/build-packet.c:1003
++#: g10/build-packet.c:1161 g10/build-packet.c:1257
msgid "a notation name must not contain more than one '@' character\n"
msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
- #: g10/build-packet.c:1021
++#: g10/build-packet.c:1179
msgid "a notation value must not use any control characters\n"
msgstr "標記值一定不能使用任何的控制字符\n"
- #: g10/build-packet.c:1055 g10/build-packet.c:1064
++#: g10/build-packet.c:1235
+ #, fuzzy
+ #| msgid "a notation name must not contain more than one '@' character\n"
+ msgid "a notation name may not contain an '=' character\n"
+ msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
+
++#: g10/build-packet.c:1241
+ #, fuzzy
+ #| msgid ""
+ #| "a notation name must have only printable characters or spaces, and end "
+ #| "with an '='\n"
+ msgid "a notation name must have only printable characters or spaces\n"
+ msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
+
++#: g10/build-packet.c:1299 g10/build-packet.c:1310
msgid "WARNING: invalid notation data found\n"
msgstr "警告: 找到無效的標記資料\n"
- #: g10/build-packet.c:1086 g10/build-packet.c:1088
- msgid "not human readable"
- msgstr "不是人類能讀得懂的"
-
- #: g10/call-agent.c:152 sm/call-agent.c:179
++#: g10/call-agent.c:151 sm/call-agent.c:200
#, c-format
msgid "failed to proxy %s inquiry to client\n"
msgstr "以 %s 代理伺服器查詢用戶端時失敗\n"
- #: g10/call-agent.c:177
++#: g10/call-agent.c:176
msgid "Enter passphrase: "
msgstr "請輸入密語: "
- #: g10/call-agent.c:267 sm/call-agent.c:91 sm/call-dirmngr.c:164
++#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error getting version from '%s': %s\n"
msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/call-agent.c:273 sm/call-agent.c:97 sm/call-dirmngr.c:170
++#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
msgstr ""
- #: g10/call-agent.c:279 sm/call-agent.c:103 sm/call-dirmngr.c:176
++#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
#, fuzzy, c-format
#| msgid "WARNING: %s overrides %s\n"
msgid "WARNING: %s\n"
msgstr "警告: %s 會推翻 %s\n"
- #: g10/card-util.c:87 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4537
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
++#: g10/keygen.c:4563
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "沒有可用的 OpenPGP 卡片: %s\n"
- #: g10/card-util.c:92 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1704
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "偵測到 OpenPGP 卡片編號 %s\n"
- #: g10/card-util.c:100 g10/card-util.c:1901 g10/delkey.c:129
- #: g10/keyedit.c:1544 g10/keygen.c:3570 g10/revoke.c:216 g10/revoke.c:618
++#: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2010
++#: g10/keygen.c:3583 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "無法在批次模式中這樣做\n"
- #: g10/card-util.c:108
++#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "祇有第二版卡片纔能用這個指令\n"
- #: g10/card-util.c:110 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2259
msgid "Reset Code not or not anymore available\n"
msgstr "(再也) 沒有重設碼\n"
- #: g10/card-util.c:143 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:472 g10/keyedit.c:492 g10/keyedit.c:506 g10/keygen.c:1709
- #: g10/keygen.c:1883 g10/keygen.c:2203 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
++#: g10/keyedit.c:984 g10/keyedit.c:1005 g10/keyedit.c:1019 g10/keygen.c:1726
++#: g10/keygen.c:1900 g10/keygen.c:2226 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "你要選哪一個? "
@@@ -1618,20 -1272,10 +1651,15 @@@ msgstr "取回公鑰的 URL:
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
- #: g10/card-util.c:799 tools/no-libgcrypt.c:30
- #, c-format
- msgid "error allocating enough memory: %s\n"
- msgstr "配置足夠的記憶體時出錯: %s\n"
-
- #: g10/card-util.c:811 g10/decrypt-data.c:242 g10/import.c:367
- #: g10/import.c:415 dirmngr/crlcache.c:656 dirmngr/crlcache.c:661
++#: g10/card-util.c:811 g10/decrypt-data.c:241 g10/import.c:366
++#: g10/import.c:414 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:844 g10/decrypt-data.c:245 g10/export.c:1645
++#: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1644
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "寫入 '%s' 時出錯: %s\n"
@@@ -1725,13 -1350,10 +1753,13 @@@ msgstr "你的加密金鑰想要用多�
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2085 g10/keygen.c:2117
++#: g10/card-util.c:1315 g10/keygen.c:2102 g10/keygen.c:2134
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "加大到 %u 位元\n"
- #: g10/card-util.c:1323 g10/keygen.c:2072 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1323 g10/keygen.c:2089 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
@@@ -1785,9 -1397,6 +1813,9 @@@ msgstr " (2) 加密用金鑰\n
msgid " (3) Authentication key\n"
msgstr " (3) 憑證用金鑰\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:976
- #: g10/keygen.c:1735 g10/keygen.c:1763 g10/keygen.c:1992 g10/keygen.c:2226
- #: g10/revoke.c:820
++#: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1489
++#: g10/keygen.c:1752 g10/keygen.c:1780 g10/keygen.c:2009 g10/keygen.c:2249
++#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "無效的選擇.\n"
@@@ -1822,7 -1425,6 +1850,7 @@@ msgstr "是否繼續? (Y/n)
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1383
++#: g10/card-util.c:1809 g10/keyedit.c:1848
msgid "quit this menu"
msgstr "離開這個選單"
@@@ -1830,7 -1431,6 +1858,7 @@@
msgid "show admin commands"
msgstr "顯示管理者指令"
- #: g10/card-util.c:1812 g10/keyedit.c:1386
++#: g10/card-util.c:1812 g10/keyedit.c:1851
msgid "show this help"
msgstr "顯示這份線上說明"
@@@ -1906,160 -1488,123 +1934,160 @@@ msgstr "允許使用管理者指令\n
msgid "Admin commands are not allowed\n"
msgstr "未允許使用管理者指令\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2321
++#: g10/card-util.c:2120 g10/keyedit.c:2796
msgid "Invalid command (try \"help\")\n"
msgstr "無效的指令 (試試看 \"help\")\n"
- #: g10/decrypt.c:192 g10/encrypt.c:940
++#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
msgstr "--output 在這個指令中沒有作用\n"
- #: g10/decrypt.c:248 g10/gpg.c:4612 g10/keyring.c:399 g10/keyring.c:772
++#: g10/decrypt.c:247 g10/gpg.c:4619 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "無法開啟 '%s'\n"
- #: g10/delkey.c:80 g10/export.c:959 g10/export.c:1447 g10/export.c:1526
- #: g10/getkey.c:491 g10/getkey.c:1614 g10/gpg.c:4568 g10/keyedit.c:1565
- #: g10/keyedit.c:2500 g10/keyedit.c:3894 g10/keylist.c:655
- #: g10/keyserver.c:1239 g10/revoke.c:232
++#: g10/delkey.c:79 g10/export.c:958 g10/export.c:1446 g10/export.c:1525
++#: g10/getkey.c:490 g10/getkey.c:1618 g10/gpg.c:4575 g10/keyedit.c:2031
++#: g10/keyedit.c:2974 g10/keyedit.c:4413 g10/keylist.c:654
++#: g10/keyserver.c:1238 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "找不到金鑰 \"%s\": %s\n"
- #: g10/delkey.c:89 g10/export.c:1028 g10/getkey.c:1622 g10/getkey.c:3840
- #: g10/gpg.c:4576 g10/keyedit.c:2408 g10/keyserver.c:1257 g10/revoke.c:238
- #: g10/revoke.c:645
++#: g10/delkey.c:88 g10/export.c:1027 g10/getkey.c:1626 g10/getkey.c:3847
++#: g10/gpg.c:4583 g10/keyedit.c:2883 g10/keyserver.c:1256 g10/revoke.c:237
++#: g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "讀取金鑰區塊時出錯: %s\n"
- #: g10/delkey.c:119 g10/getkey.c:567
++#: g10/delkey.c:118 g10/getkey.c:566
#, 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
++#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(除非你用指紋指定了金鑰)\n"
- #: g10/delkey.c:136
++#: g10/delkey.c:135
msgid "can't do this in batch mode without \"--yes\"\n"
msgstr "沒有 \"--yes\" 就沒辦法在批次模式中這麼做\n"
- #: g10/delkey.c:149
++#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "要從鑰匙圈裡刪除這把金鑰嗎? (y/N) "
- #: g10/delkey.c:159
++#: g10/delkey.c:158
msgid "This is a secret key! - really delete? (y/N) "
msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
- #: g10/delkey.c:196
++#: g10/delkey.c:195
#, c-format
msgid "deleting secret %s failed: %s\n"
msgstr "刪除私鑰 %s 時失敗: %s\n"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "key"
msgstr "金鑰"
- #: g10/delkey.c:198
++#: g10/delkey.c:197
msgid "subkey"
msgstr "子鑰"
- #: g10/delkey.c:221
++#: g10/delkey.c:220
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "刪除金鑰區塊時失敗: %s\n"
- #: g10/delkey.c:234
++#: g10/delkey.c:233
msgid "ownertrust information cleared\n"
msgstr "主觀信任資訊已清除\n"
- #: g10/delkey.c:270
++#: g10/delkey.c:269
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
- #: g10/delkey.c:272
++#: g10/delkey.c:271
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
- #: g10/encrypt.c:226 g10/sign.c:1262
++#: g10/encrypt.c:233 g10/sign.c:1261
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "建立密語時出錯: %s\n"
- #: g10/encrypt.c:233
++#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
- #: g10/encrypt.c:247
++#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
msgstr "正在使用 %s 編密法\n"
- #: g10/encrypt.c:257 g10/encrypt.c:618
++#: g10/encrypt.c:264 g10/encrypt.c:625
#, c-format
msgid "'%s' already compressed\n"
msgstr "'%s' 已經被壓縮了\n"
- #: g10/encrypt.c:314 g10/encrypt.c:654 g10/sign.c:580
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:579
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "警告: '%s' 是個空檔案\n"
- #: g10/encrypt.c:551
++#: g10/encrypt.c:558
#, c-format
msgid "reading from '%s'\n"
msgstr "正在從 '%s' 讀取\n"
- #: g10/encrypt.c:599
++#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
- #: g10/encrypt.c:701 g10/sign.c:955
++#: g10/encrypt.c:708 g10/sign.c:954
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
- #: g10/encrypt.c:811
++#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
- #: g10/encrypt.c:882 g10/pkclist.c:985 g10/pkclist.c:1036
- #, c-format
- msgid "you may not use %s while in %s mode\n"
- msgstr "你不能夠將 %s 用於 %s 模式中\n"
-
- #: g10/encrypt.c:910
++#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已加密給: \"%s\"\n"
- #: g10/decrypt-data.c:94 g10/mainproc.c:307
++#: g10/encrypt.c:932 g10/pkclist.c:1000 g10/pkclist.c:1051
+ #, c-format
+ msgid "you may not use %s while in %s mode\n"
+ msgstr "你不能夠將 %s 用於 %s 模式中\n"
+
++#: g10/decrypt-data.c:93 g10/mainproc.c:306
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 已加密的資料\n"
- #: g10/decrypt-data.c:97 g10/mainproc.c:311
++#: g10/decrypt-data.c:96 g10/mainproc.c:310
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以 %d 未知演算法所加密\n"
- #: g10/decrypt-data.c:165 sm/decrypt.c:127
++#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
- #: g10/decrypt-data.c:177
++#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
msgstr "處理已加密封包有問題\n"
@@@ -2114,129 -1648,101 +2142,129 @@@ msgstr "警告: 無法移除暫存檔 (
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
- #: g10/export.c:79
++#: g10/export.c:78
msgid "export signatures that are marked as local-only"
msgstr "匯出標記為僅限本機使用的簽章"
- #: g10/export.c:81
++#: g10/export.c:80
msgid "export attribute user IDs (generally photo IDs)"
msgstr "匯出署名使用者 ID (通常是照片 ID)"
- #: g10/export.c:83
++#: g10/export.c:82
msgid "export revocation keys marked as \"sensitive\""
msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
- #: g10/export.c:85
++#: g10/export.c:84
msgid "remove unusable parts from key during export"
msgstr "匯出時從金鑰中移除無法使用的部分"
- #: g10/export.c:87
++#: g10/export.c:86
msgid "remove as much as possible from key during export"
msgstr "匯出時盡可能地從金鑰中移除"
- #: g10/export.c:896
++#: g10/export.c:895
msgid " - skipped"
msgstr " - 已跳過"
- #: g10/export.c:976
++#: g10/export.c:975
msgid "exporting secret keys not allowed\n"
msgstr "不允許匯出私鑰\n"
- #: g10/export.c:1054
++#: g10/export.c:1053
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
- #: g10/export.c:1241
++#: g10/export.c:1240
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
- #: g10/export.c:1352
++#: g10/export.c:1351
msgid "WARNING: nothing exported\n"
msgstr "警告: 沒有匯出任何東西\n"
- #: g10/export.c:1609 g10/plaintext.c:137 g10/plaintext.c:146
- #: g10/plaintext.c:152 g10/plaintext.c:175
++#: g10/export.c:1608 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "建立 '%s' 時出錯: %s\n"
- #: g10/getkey.c:245
++#: g10/getkey.c:244
msgid "[User ID not found]"
msgstr "[找不到使用者 ID]"
- #: g10/getkey.c:494 g10/getkey.c:507 g10/getkey.c:569 g10/getkey.c:1594
- #: g10/pkclist.c:945
++#: g10/getkey.c:493 g10/getkey.c:506 g10/getkey.c:568 g10/getkey.c:1598
++#: g10/pkclist.c:960
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
msgstr "\"%.50s\" 選項遺失了引數\n"
- #: g10/getkey.c:504
++#: g10/getkey.c:503
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:534
++#: g10/getkey.c:533
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "關閉 %s 時出錯: %s\n"
- #: g10/getkey.c:624
++#: g10/getkey.c:623
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/getkey.c:1417
++#: g10/getkey.c:1421
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "已自動取回 '%s' (經由 %s )\n"
- #: g10/getkey.c:1423
++#: g10/getkey.c:1427
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
- #: g10/getkey.c:1425
++#: g10/getkey.c:1429
msgid "No fingerprint"
msgstr "沒有指紋"
- #: g10/getkey.c:1591 g10/keyedit.c:2433 g10/revoke.c:637 g10/revoke.c:702
++#: g10/getkey.c:1595 g10/keyedit.c:2908 g10/revoke.c:636 g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "找不到私鑰 \"%s\": %s\n"
- #: g10/getkey.c:1674
++#: g10/getkey.c:1678
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|名字|使用指定名字做為預設私鑰"
- #: g10/getkey.c:1682
++#: g10/getkey.c:1686
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|名字|使用指定名字做為預設私鑰"
- #: g10/getkey.c:1689
++#: g10/getkey.c:1693
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2484
++#: g10/getkey.c:2488
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
- #: g10/getkey.c:3296
++#: g10/getkey.c:3301
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子鑰 %s 來替換主鑰 %s\n"
- #: g10/gpg.c:406 sm/gpgsm.c:195
++#: g10/gpg.c:406 sm/gpgsm.c:198
msgid "make a signature"
msgstr "建立簽章"
@@@ -2244,11 -1749,9 +2272,11 @@@
msgid "make a clear text signature"
msgstr "建立明文簽章"
- #: g10/gpg.c:408 sm/gpgsm.c:197
++#: g10/gpg.c:408 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "建立分離式簽章"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:409 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "加密資料"
@@@ -2256,15 -1758,12 +2284,15 @@@
msgid "encryption only with symmetric cipher"
msgstr "僅使用對稱式編密法來加密"
- #: g10/gpg.c:413 sm/gpgsm.c:200
++#: g10/gpg.c:413 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "資料解密 (預設)"
- #: g10/gpg.c:415 sm/gpgsm.c:201
++#: g10/gpg.c:415 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "驗證簽章"
- #: g10/gpg.c:417 sm/gpgsm.c:202
++#: g10/gpg.c:417 sm/gpgsm.c:205
msgid "list keys"
msgstr "列出金鑰"
@@@ -2276,15 -1773,12 +2304,15 @@@ msgstr "列出金鑰和簽章
msgid "list and check key signatures"
msgstr "列出並檢查金鑰簽章"
- #: g10/gpg.c:421 sm/gpgsm.c:207
++#: g10/gpg.c:421 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "列出金鑰和指紋"
- #: g10/gpg.c:422 sm/gpgsm.c:205
++#: g10/gpg.c:422 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "列出私鑰"
- #: g10/gpg.c:424 sm/gpgsm.c:208
++#: g10/gpg.c:424 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "產生新的金鑰對"
@@@ -2306,7 -1796,6 +2334,7 @@@ msgstr "全能金鑰對生成
msgid "generate a revocation certificate"
msgstr "產生撤銷憑證"
- #: g10/gpg.c:433 sm/gpgsm.c:210
++#: g10/gpg.c:433 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "從公鑰鑰匙圈裡移除金鑰"
@@@ -2334,7 -1817,6 +2362,7 @@@ msgstr "僅在本機簽署金鑰
msgid "sign or edit a key"
msgstr "簽署或編輯金鑰"
- #: g10/gpg.c:444 sm/gpgsm.c:228
++#: g10/gpg.c:444 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "更改密語"
@@@ -2382,23 -1853,18 +2410,23 @@@ msgstr "更新信任資料庫
msgid "print message digests"
msgstr "印出訊息摘要"
- #: g10/gpg.c:487 sm/gpgsm.c:223
++#: g10/gpg.c:487 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "以伺服器模式執行"
+#: g10/gpg.c:489
- msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+ msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:493 sm/gpgsm.c:241
++#: g10/gpg.c:493 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "建立以 ASCII 封裝過的輸出"
- #: g10/gpg.c:496 sm/gpgsm.c:254
++#: g10/gpg.c:496 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
- #: g10/gpg.c:510 sm/gpgsm.c:290
++#: g10/gpg.c:510 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
@@@ -2410,11 -1874,9 +2438,11 @@@ msgstr "|N|設定壓縮等級為 N (0 �
msgid "use canonical text mode"
msgstr "使用標準的文字模式"
- #: g10/gpg.c:538 sm/gpgsm.c:292
++#: g10/gpg.c:538 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|檔案|將輸出寫入至指定檔案"
- #: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:304 tools/gpgconf.c:87
++#: g10/gpg.c:550 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:87
msgid "do not make any changes"
msgstr "不要做任何改變"
@@@ -2426,7 -1886,6 +2454,7 @@@ msgstr "覆寫前先詢問
msgid "use strict OpenPGP behavior"
msgstr "使用嚴謹的 OpenPGP 行為"
- #: g10/gpg.c:622 sm/gpgsm.c:348
++#: g10/gpg.c:622 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2434,7 -1893,6 +2462,7 @@@ msgstr "
"@\n"
"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
- #: g10/gpg.c:625 sm/gpgsm.c:351
++#: g10/gpg.c:625 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2454,11 -1912,9 +2482,11 @@@ msgstr "
" --list-keys [名字] 顯示金鑰\n"
" --fingerprint [名字] 顯示指紋\n"
- #: g10/gpg.c:985
++#: g10/gpg.c:988
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
- #: g10/gpg.c:988
++#: g10/gpg.c:991
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2468,7 -1924,6 +2496,7 @@@ msgstr "
"簽署, 檢查, 加密, 解密\n"
"預設的操作會依輸入資料而定\n"
- #: g10/gpg.c:999 sm/gpgsm.c:580
++#: g10/gpg.c:1002 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2476,580 -1931,451 +2504,580 @@@ msgstr "
"\n"
"已支援的演算法:\n"
- #: g10/gpg.c:1002
++#: g10/gpg.c:1005
msgid "Pubkey: "
msgstr "公鑰: "
- #: g10/gpg.c:1009 g10/keyedit.c:2667
++#: g10/gpg.c:1012 g10/keyedit.c:3186
msgid "Cipher: "
msgstr "編密法: "
- #: g10/gpg.c:1016
++#: g10/gpg.c:1019
msgid "Hash: "
msgstr "雜湊: "
- #: g10/gpg.c:1023 g10/keyedit.c:2716
++#: g10/gpg.c:1026 g10/keyedit.c:3235
msgid "Compression: "
msgstr "壓縮: "
- #: g10/gpg.c:1092 sm/gpgsm.c:654
++#: g10/gpg.c:1095 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法: %s [選項] %s\n"
- #: g10/gpg.c:1292 sm/gpgsm.c:743
++#: g10/gpg.c:1295 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "指令彼此矛盾\n"
- #: g10/gpg.c:1310
++#: g10/gpg.c:1313
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1510
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1513
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1516
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1522
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1525
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1528
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1534
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1537
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1540
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1546
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1549
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1552
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1759
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "未知的組態項目 '%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1866
msgid "display photo IDs during key listings"
msgstr "列出金鑰時顯示照片 ID"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1868
msgid "show key usage information during key listings"
msgstr "列出金鑰時顯示金鑰用途資訊"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1870
msgid "show policy URLs during signature listings"
msgstr "列出簽章時顯示原則 URL"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1872
msgid "show all notations during signature listings"
msgstr "列出簽章時顯示所有的註記"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1874
msgid "show IETF standard notations during signature listings"
msgstr "列出簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1878
msgid "show user-supplied notations during signature listings"
msgstr "列出簽章時顯示使用者提供的註記"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1880
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1882
msgid "show user ID validity during key listings"
msgstr "列出金鑰時顯示使用者 ID 有效性"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1884
msgid "show revoked and expired user IDs in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1886
msgid "show revoked and expired subkeys in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1888
msgid "show the keyring name in key listings"
msgstr "在金鑰清單中顯示鑰匙圈名稱"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1890
msgid "show expiration dates during signature listings"
msgstr "列出簽章時顯示有效期限"
- #: g10/gpg.c:1989
++#: g10/gpg.c:1992
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "可用金鑰:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2003
#, fuzzy, c-format
#| msgid "unknown option '%s'\n"
msgid "unknown TOFU policy '%s'\n"
msgstr "未知的選項 '%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2005 g10/gpg.c:2029
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2027
#, fuzzy, c-format
#| msgid "unknown command '%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "未知的指令 '%s'\n"
- #: g10/gpg.c:2087
++#: g10/gpg.c:2090
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
- #: g10/gpg.c:2182
++#: g10/gpg.c:2185
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
- #: g10/gpg.c:2664 g10/gpg.c:3400 g10/gpg.c:3412
++#: g10/gpg.c:2671 g10/gpg.c:3407 g10/gpg.c:3419
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "請注意: 一般情況下不採用 %s!\n"
- #: g10/gpg.c:2848 g10/gpg.c:2860
++#: g10/gpg.c:2855 g10/gpg.c:2867
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' 不是有效的簽章使用期限\n"
- #: g10/gpg.c:2901
++#: g10/gpg.c:2908 sm/gpgsm.c:1167
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無效的個人識別碼項目模式 '%s'\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2961
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' 不是有效的字元集\n"
- #: g10/gpg.c:2976 g10/gpg.c:3172 g10/keyedit.c:4495
++#: g10/gpg.c:2983 g10/gpg.c:3179 g10/keyedit.c:5119
msgid "could not parse keyserver URL\n"
msgstr "無法剖析金鑰伺服器 URL\n"
- #: g10/gpg.c:2994
++#: g10/gpg.c:3001
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無效的金鑰伺服器選項\n"
- #: g10/gpg.c:2997
++#: g10/gpg.c:3004
msgid "invalid keyserver options\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/gpg.c:3004
++#: g10/gpg.c:3011
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無效的匯入選項\n"
- #: g10/gpg.c:3007
++#: g10/gpg.c:3014
msgid "invalid import options\n"
msgstr "無效的匯入選項\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3021
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無效的匯出選項\n"
- #: g10/gpg.c:3017
++#: g10/gpg.c:3024
msgid "invalid export options\n"
msgstr "無效的匯出選項\n"
- #: g10/gpg.c:3024
++#: g10/gpg.c:3031
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無效的清單選項\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3034
msgid "invalid list options\n"
msgstr "無效的清單選項\n"
- #: g10/gpg.c:3035
++#: g10/gpg.c:3042
msgid "display photo IDs during signature verification"
msgstr "驗證簽章時顯示照片 ID"
- #: g10/gpg.c:3037
++#: g10/gpg.c:3044
msgid "show policy URLs during signature verification"
msgstr "驗證簽章時顯示原則 URL"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3046
msgid "show all notations during signature verification"
msgstr "驗證簽章時顯示所有的註記"
- #: g10/gpg.c:3041
++#: g10/gpg.c:3048
msgid "show IETF standard notations during signature verification"
msgstr "驗證簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:3045
++#: g10/gpg.c:3052
msgid "show user-supplied notations during signature verification"
msgstr "驗證簽章時顯示使用者提供的註記"
- #: g10/gpg.c:3047
++#: g10/gpg.c:3054
msgid "show preferred keyserver URLs during signature verification"
msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:3049
++#: g10/gpg.c:3056
msgid "show user ID validity during signature verification"
msgstr "驗證簽章時顯示使用者 ID 有效性"
- #: g10/gpg.c:3051
++#: g10/gpg.c:3058
msgid "show revoked and expired user IDs in signature verification"
msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:3053
++#: g10/gpg.c:3060
msgid "show only the primary user ID in signature verification"
msgstr "驗證簽章時祇顯示主要的使用者 ID"
- #: g10/gpg.c:3055
++#: g10/gpg.c:3062
msgid "validate signatures with PKA data"
msgstr "以 PKA 資料驗證簽章"
- #: g10/gpg.c:3057
++#: g10/gpg.c:3064
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提高對持有有效 PKA 資料之簽章的信任"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3071
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無效的驗證選項\n"
- #: g10/gpg.c:3067
++#: g10/gpg.c:3074
msgid "invalid verify options\n"
msgstr "無效的驗證選項\n"
- #: g10/gpg.c:3074
++#: g10/gpg.c:3081
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "無法把執行檔路徑設成 %s\n"
- #: g10/gpg.c:3265
++#: g10/gpg.c:3272
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3268
++#: g10/gpg.c:3275
msgid "invalid auto-key-locate list\n"
msgstr "無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3389 sm/gpgsm.c:1487
++#: g10/gpg.c:3396 sm/gpgsm.c:1504
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
- #: g10/gpg.c:3393
++#: g10/gpg.c:3400
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告: %s 會推翻 %s\n"
- #: g10/gpg.c:3402
++#: g10/gpg.c:3409
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不允許跟 %s 併用!\n"
- #: g10/gpg.c:3405
++#: g10/gpg.c:3412
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 跟 %s 放在一起沒有意義!\n"
- #: g10/gpg.c:3420 sm/gpgsm.c:1504 dirmngr/dirmngr.c:1033
++#: g10/gpg.c:3427 sm/gpgsm.c:1521 dirmngr/dirmngr.c:1033
msgid "WARNING: running with faked system time: "
msgstr "警告: 正在偽造的系統時間中執行: "
- #: g10/gpg.c:3441
++#: g10/gpg.c:3448
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
- #: g10/gpg.c:3476 g10/gpg.c:3500 sm/gpgsm.c:1569
++#: g10/gpg.c:3483 g10/gpg.c:3507 sm/gpgsm.c:1586
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
- #: g10/gpg.c:3482 g10/gpg.c:3506 sm/gpgsm.c:1575 sm/gpgsm.c:1581
++#: g10/gpg.c:3489 g10/gpg.c:3513 sm/gpgsm.c:1592 sm/gpgsm.c:1598
msgid "selected digest algorithm is invalid\n"
msgstr "所選的摘要演算法無效\n"
- #: g10/gpg.c:3488
++#: g10/gpg.c:3495
msgid "selected compression algorithm is invalid\n"
msgstr "所選的壓縮演算法無效\n"
- #: g10/gpg.c:3494
++#: g10/gpg.c:3501
msgid "selected certification digest algorithm is invalid\n"
msgstr "所選的憑證摘要演算法無效\n"
- #: g10/gpg.c:3509
++#: g10/gpg.c:3516
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed 一定要大於 0\n"
- #: g10/gpg.c:3511
++#: g10/gpg.c:3518
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed 一定要大於 1\n"
- #: g10/gpg.c:3513
++#: g10/gpg.c:3520
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
- #: g10/gpg.c:3515
++#: g10/gpg.c:3522
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:3517
++#: g10/gpg.c:3524
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3527
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3531
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3538
msgid "invalid default preferences\n"
msgstr "無效的預設偏好\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3542
msgid "invalid personal cipher preferences\n"
msgstr "無效的個人編密法偏好\n"
- #: g10/gpg.c:3539
++#: g10/gpg.c:3546
msgid "invalid personal digest preferences\n"
msgstr "無效的個人摘要偏好\n"
- #: g10/gpg.c:3543
++#: g10/gpg.c:3550
msgid "invalid personal compress preferences\n"
msgstr "無效的個人壓縮偏好\n"
- #: g10/gpg.c:3579
++#: g10/gpg.c:3586
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 還沒辦法跟 %s 一起運作\n"
- #: g10/gpg.c:3626
++#: g10/gpg.c:3633
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
- #: g10/gpg.c:3631
++#: g10/gpg.c:3638
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
- #: g10/gpg.c:3636
++#: g10/gpg.c:3643
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
- #: g10/gpg.c:3729
++#: g10/gpg.c:3736
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信任資料庫啟始失敗: %s\n"
- #: g10/gpg.c:3741
++#: g10/gpg.c:3748
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
- #: g10/gpg.c:3796
++#: g10/gpg.c:3803
msgid "--store [filename]"
msgstr "--store [檔名]"
- #: g10/gpg.c:3806
++#: g10/gpg.c:3813
msgid "--symmetric [filename]"
msgstr "--symmetric [檔名]"
- #: g10/gpg.c:3810
++#: g10/gpg.c:3817
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s' 對稱式加密失敗: %s\n"
- #: g10/gpg.c:3821
++#: g10/gpg.c:3828
msgid "--encrypt [filename]"
msgstr "--encrypt [檔名]"
- #: g10/gpg.c:3837
++#: g10/gpg.c:3844
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [檔名]"
- #: g10/gpg.c:3839
++#: g10/gpg.c:3846
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:3842
++#: g10/gpg.c:3849
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:3863
++#: g10/gpg.c:3870
msgid "--sign [filename]"
msgstr "--sign [檔名]"
- #: g10/gpg.c:3879
++#: g10/gpg.c:3886
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [檔名]"
- #: g10/gpg.c:3897
++#: g10/gpg.c:3904
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [檔名]"
- #: g10/gpg.c:3899
++#: g10/gpg.c:3906
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3902
++#: g10/gpg.c:3909
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3926
++#: g10/gpg.c:3933
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [檔名]"
- #: g10/gpg.c:3938
++#: g10/gpg.c:3945
msgid "--clearsign [filename]"
msgstr "--clearsign [檔名]"
- #: g10/gpg.c:3968
++#: g10/gpg.c:3975
msgid "--decrypt [filename]"
msgstr "--decrypt [檔名]"
- #: g10/gpg.c:3995
++#: g10/gpg.c:4002
msgid "--sign-key user-id"
msgstr "--sign-key 使用者ID"
- #: g10/gpg.c:3999
++#: g10/gpg.c:4006
msgid "--lsign-key user-id"
msgstr "--lsign-key 使用者ID"
- #: g10/gpg.c:4020
++#: g10/gpg.c:4027
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 使用者ID [指令]"
- #: g10/gpg.c:4036
++#: g10/gpg.c:4043
msgid "--passwd <user-id>"
msgstr "--passwd 使用者ID"
- #: g10/gpg.c:4174 g10/keyserver.c:1832
++#: g10/gpg.c:4181 g10/keyserver.c:1831
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "送至金鑰伺服器失敗: %s\n"
- #: g10/gpg.c:4179
++#: g10/gpg.c:4186
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "從金鑰伺服器接收失敗: %s\n"
- #: g10/gpg.c:4185
++#: g10/gpg.c:4192
#, c-format
msgid "key export failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4198
++#: g10/gpg.c:4205
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4210
++#: g10/gpg.c:4217
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "用金鑰伺服器搜尋失敗: %s\n"
- #: g10/gpg.c:4223
++#: g10/gpg.c:4230
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "從金鑰伺服器更新失敗: %s\n"
- #: g10/gpg.c:4290
++#: g10/gpg.c:4297
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解開封裝失敗: %s\n"
- #: g10/gpg.c:4301
++#: g10/gpg.c:4308
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "進行封裝失敗: %s\n"
- #: g10/gpg.c:4393
++#: g10/gpg.c:4400
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無效的雜湊演算法 '%s'\n"
- #: g10/gpg.c:4537
++#: g10/gpg.c:4544
#, 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:4549
++#: g10/gpg.c:4556
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4596
++#: g10/gpg.c:4603
msgid "[filename]"
msgstr "[檔名]"
- #: g10/gpg.c:4602
++#: g10/gpg.c:4609
msgid "Go ahead and type your message ...\n"
msgstr "請開始輸入你的訊息 ...\n"
- #: g10/gpg.c:4940
++#: g10/gpg.c:4947
msgid "the given certification policy URL is invalid\n"
msgstr "給定的的憑證原則 URL 無效\n"
- #: g10/gpg.c:4942
++#: g10/gpg.c:4949
msgid "the given signature policy URL is invalid\n"
msgstr "給定的簽章原則 URL 無效\n"
- #: g10/gpg.c:4975
++#: g10/gpg.c:4982
msgid "the given preferred keyserver URL is invalid\n"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
@@@ -3061,7 -2385,6 +3089,7 @@@ msgstr "|檔案|從指定鑰匙圈檔�
msgid "make timestamp conflicts only a warning"
msgstr "僅把時間戳印矛盾視為警告"
- #: g10/gpgv.c:79 sm/gpgsm.c:338
++#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
@@@ -3086,321 -2405,255 +3114,321 @@@ msgstr "沒有可用的說明
msgid "No help available for '%s'"
msgstr "'%s' 沒有可用的說明"
- #: g10/import.c:105
++#: g10/import.c:104
msgid "import signatures that are marked as local-only"
msgstr "匯入標記為僅限本機使用的簽章"
- #: g10/import.c:108
++#: g10/import.c:107
msgid "repair damage from the pks keyserver during import"
msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
- #: g10/import.c:111
++#: g10/import.c:110
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "匯入後不要更新信任資料庫"
- #: g10/import.c:114
++#: g10/import.c:113
msgid "do not update the trustdb after import"
msgstr "匯入後不要更新信任資料庫"
- #: g10/import.c:117
++#: g10/import.c:116
msgid "only accept updates to existing keys"
msgstr "祇接受既有金鑰的更新"
- #: g10/import.c:120
++#: g10/import.c:119
msgid "remove unusable parts from key after import"
msgstr "匯入後從金鑰中移除無法使用的部分"
- #: g10/import.c:123
++#: g10/import.c:122
msgid "remove as much as possible from key after import"
msgstr "匯入後盡可能地從金鑰中移除"
- #: g10/import.c:344
++#: g10/import.c:343
#, c-format
msgid "skipping block of type %d\n"
msgstr "正在跳過 %d 型態的區塊\n"
- #: g10/import.c:361
++#: g10/import.c:360
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已處理 %lu 把金鑰\n"
- #: g10/import.c:431
++#: g10/import.c:430
#, c-format
msgid "Total number processed: %lu\n"
msgstr "處理總量: %lu\n"
- #: g10/import.c:434
++#: g10/import.c:433
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " 已跳過的新金鑰: %lu\n"
- #: g10/import.c:436
++#: g10/import.c:435
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳過的新金鑰: %lu\n"
- #: g10/import.c:439
++#: g10/import.c:438
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 沒有使用者的 ID: %lu\n"
- #: g10/import.c:442 sm/import.c:130
++#: g10/import.c:441 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " 已匯入: %lu"
- #: g10/import.c:446 sm/import.c:134
++#: g10/import.c:445 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改變的: %lu\n"
- #: g10/import.c:448
++#: g10/import.c:447
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新的使用者 ID: %lu\n"
- #: g10/import.c:450
++#: g10/import.c:449
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子鑰: %lu\n"
- #: g10/import.c:452
++#: g10/import.c:451
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的簽章: %lu\n"
- #: g10/import.c:454
++#: g10/import.c:453
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的金鑰撤銷: %lu\n"
- #: g10/import.c:456 sm/import.c:136
++#: g10/import.c:455 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 已讀取的私鑰: %lu\n"
- #: g10/import.c:458 sm/import.c:138
++#: g10/import.c:457 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 已匯入的私鑰: %lu\n"
- #: g10/import.c:460 sm/import.c:140
++#: g10/import.c:459 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改變的私鑰: %lu\n"
- #: g10/import.c:462 sm/import.c:142
++#: g10/import.c:461 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被匯入: %lu\n"
- #: g10/import.c:464
++#: g10/import.c:463
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 已清除的簽章: %lu\n"
- #: g10/import.c:466
++#: g10/import.c:465
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 已清除的使用者 ID: %lu\n"
- #: g10/import.c:810
++#: g10/import.c:809
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
- #: g10/import.c:852
++#: g10/import.c:851
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": 編密演算法 %s 的偏好設定\n"
- #: g10/import.c:867
++#: g10/import.c:866
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": 摘要演算法 %s 的偏好設定\n"
- #: g10/import.c:879
++#: g10/import.c:878
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": 壓縮演算法 %s 的偏好設定\n"
- #: g10/import.c:892
++#: g10/import.c:891
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "我們強烈建議你更新偏好設定, 並重新\n"
- #: g10/import.c:894
++#: g10/import.c:893
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
- #: g10/import.c:919
++#: g10/import.c:918
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
- #: g10/import.c:983 g10/import.c:1711
++#: g10/import.c:982 g10/import.c:1710
#, c-format
msgid "key %s: no user ID\n"
msgstr "金鑰 %s: 沒有使用者 ID\n"
- #: g10/import.c:989
++#: g10/import.c:988
#, c-format
msgid "key %s: %s\n"
msgstr "金鑰 %s: %s\n"
- #: g10/import.c:990 g10/import.c:1685
++#: g10/import.c:989 g10/import.c:1684
msgid "rejected by import screener"
msgstr "遭到匯入篩選程式駁回"
- #: g10/import.c:1020
++#: g10/import.c:1019
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
- #: g10/import.c:1036
++#: g10/import.c:1035
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
- #: g10/import.c:1046
++#: g10/import.c:1045
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
- #: g10/import.c:1048
++#: g10/import.c:1047
msgid "this may be caused by a missing self-signature\n"
msgstr "這可能肇因於遺失自我簽章所致\n"
- #: g10/import.c:1061 g10/import.c:1856
++#: g10/import.c:1060 g10/import.c:1855
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "金鑰 %s: 找不到公鑰: %s\n"
- #: g10/import.c:1067
++#: g10/import.c:1066
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
- #: g10/import.c:1082
++#: g10/import.c:1081
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可寫入的鑰匙圈: %s\n"
- #: g10/import.c:1087 g10/openfile.c:207 g10/openfile.c:301 g10/sign.c:816
- #: g10/sign.c:1118
++#: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:815
++#: g10/sign.c:1117
#, c-format
msgid "writing to '%s'\n"
msgstr "正在寫入 '%s'\n"
- #: g10/import.c:1091 g10/import.c:1192 g10/import.c:1922
++#: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/import.c:1111
++#: g10/import.c:1110
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
- #: g10/import.c:1135
++#: g10/import.c:1134
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "金鑰 %s: 跟我們的副本不吻合\n"
- #: g10/import.c:1151 g10/import.c:1880
++#: g10/import.c:1150 g10/import.c:1879
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
- #: g10/import.c:1159 g10/import.c:1887
++#: g10/import.c:1158 g10/import.c:1886
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
- #: g10/import.c:1202
++#: g10/import.c:1201
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
- #: g10/import.c:1205
++#: g10/import.c:1204
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
- #: g10/import.c:1208
++#: g10/import.c:1207
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
- #: g10/import.c:1211
++#: g10/import.c:1210
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
- #: g10/import.c:1214
++#: g10/import.c:1213
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
- #: g10/import.c:1217
++#: g10/import.c:1216
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
- #: g10/import.c:1220
++#: g10/import.c:1219
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
- #: g10/import.c:1223
++#: g10/import.c:1222
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
- #: g10/import.c:1226
++#: g10/import.c:1225
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
- #: g10/import.c:1229
++#: g10/import.c:1228
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
- #: g10/import.c:1252
++#: g10/import.c:1251
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "金鑰 %s: \"%s\" 未改變\n"
- #: g10/import.c:1563 g10/import.c:1805
++#: g10/import.c:1562 g10/import.c:1804
#, c-format
msgid "key %s: secret key imported\n"
msgstr "金鑰 %s: 私鑰已匯入\n"
- #: g10/import.c:1571
++#: g10/import.c:1570
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "金鑰 %s: 私鑰已存在\n"
- #: g10/import.c:1579
++#: g10/import.c:1578
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
- #: g10/import.c:1684
++#: g10/import.c:1683
#, c-format
msgid "secret key %s: %s\n"
msgstr "私鑰 %s: %s\n"
- #: g10/import.c:1704 g10/import.c:1739
++#: g10/import.c:1703 g10/import.c:1738
msgid "importing secret keys not allowed\n"
msgstr "未允許匯入私鑰\n"
- #: g10/import.c:1728
++#: g10/import.c:1727
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
@@@ -3415,87 -2668,70 +3443,87 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1797
++#: g10/import.c:1796
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1849
++#: g10/import.c:1848
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
- #: g10/import.c:1898
++#: g10/import.c:1897
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
- #: g10/import.c:1931
++#: g10/import.c:1930
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
- #: g10/import.c:2007
++#: g10/import.c:2006
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
- #: g10/import.c:2024
++#: g10/import.c:2023
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
- #: g10/import.c:2026
++#: g10/import.c:2025
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
- #: g10/import.c:2043 g10/import.c:2069 g10/import.c:2120
++#: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "金鑰 %s: 未支援的公鑰演算法\n"
- #: g10/import.c:2044
++#: g10/import.c:2043
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
- #: g10/import.c:2058
++#: g10/import.c:2057
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
- #: g10/import.c:2071
++#: g10/import.c:2070
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "金鑰 %s: 無效的附帶子鑰\n"
- #: g10/import.c:2087
++#: g10/import.c:2086
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
- #: g10/import.c:2109
++#: g10/import.c:2108
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
- #: g10/import.c:2122
++#: g10/import.c:2121
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "金鑰 %s: 無效的子鑰撤銷\n"
- #: g10/import.c:2137
++#: g10/import.c:2136
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
- #: g10/import.c:2182
++#: g10/import.c:2181
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
- #: g10/import.c:2205
++#: g10/import.c:2204
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "金鑰 %s: 子鑰已跳過\n"
@@@ -3504,129 -2740,132 +3532,161 @@@
# * 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:2234
++#: g10/import.c:2233
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
- #: g10/import.c:2245
++#: g10/import.c:2244
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
- #: g10/import.c:2263
++#: g10/import.c:2262
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
- #: g10/import.c:2277
++#: g10/import.c:2276
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
- #: g10/import.c:2285
++#: g10/import.c:2284
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
- #: g10/import.c:2414
++#: g10/import.c:2413
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
- #: g10/import.c:2478
++#: g10/import.c:2477
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
- #: g10/import.c:2494
++#: g10/import.c:2493
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
- #: g10/import.c:2558
++#: g10/import.c:2557
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
- #: g10/import.c:2596
++#: g10/import.c:2595
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
- #: g10/keydb.c:403 g10/keydb.c:430 sm/keydb.c:210
++#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, c-format
msgid "error creating keybox '%s': %s\n"
msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
- #: g10/keydb.c:406 g10/keydb.c:433
++#: g10/keydb.c:405 g10/keydb.c:432
#, c-format
msgid "error creating keyring '%s': %s\n"
msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/keydb.c:442 sm/keydb.c:217
++#: g10/keydb.c:441 sm/keydb.c:229
#, c-format
msgid "keybox '%s' created\n"
msgstr "鑰匙盒 '%s' 已建立\n"
- #: g10/keydb.c:444
++#: g10/keydb.c:443
#, c-format
msgid "keyring '%s' created\n"
msgstr "鑰匙圈 '%s' 已建立\n"
- #: g10/keydb.c:823
++#: g10/keydb.c:822
#, c-format
msgid "keyblock resource '%s': %s\n"
msgstr "金鑰區塊資源 '%s': %s\n"
- #: g10/keydb.c:908
++#: g10/keydb.c:907
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening key DB: %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
- #: g10/keydb.c:1778
++#: g10/keydb.c:1777
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立鑰匙圈快取失敗: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[revocation]"
msgstr "[撤銷]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[自我簽章]"
- #: g10/keyedit.c:387 g10/keylist.c:472
++#: g10/keyedit.c:611
#, fuzzy, c-format
- #| msgid "%d bad signatures\n"
- msgid "%d bad signature\n"
- msgid_plural "%d bad signatures\n"
- msgstr[0] "%d 份損壞的簽章\n"
+ #| msgid "key %s: unsupported public key algorithm\n"
+ msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+ msgstr "金鑰 %s: 未支援的公鑰演算法\n"
+
++#: g10/keyedit.c:620
+ #, fuzzy, c-format
+ #| msgid "card does not support digest algorithm %s\n"
+ msgid ""
+ "can't check signature with unsupported message-digest algorithm %d: %s.\n"
+ msgstr "卡片不支援 %s 摘要演算法\n"
+
++#: g10/keyedit.c:782
+ #, fuzzy
+ #| msgid "Good signature from"
+ msgid " (reordered signatures follow)"
+ msgstr "完好的簽章來自於"
+
++#: g10/keyedit.c:895
+ #, fuzzy, c-format
+ #| msgid "key %s: %s\n"
+ msgid "key %s:\n"
+ msgstr "金鑰 %s: %s\n"
- #: g10/keyedit.c:391 g10/keylist.c:476
++#: g10/keyedit.c:898
+ #, fuzzy, c-format
+ #| msgid "User ID \"%s\": %d signature removed\n"
+ msgid "%d duplicate signature removed\n"
+ msgid_plural "%d duplicate signatures removed\n"
+ msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
+
++#: g10/keyedit.c:901 g10/keylist.c:475
#, fuzzy, c-format
#| msgid "1 signature not checked due to a missing key\n"
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
- #: g10/keyedit.c:396 g10/keylist.c:481
++#: g10/keyedit.c:905 g10/keylist.c:471
#, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
- msgid "%d signature not checked due to an error\n"
- msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "有 1 份簽章因錯誤而未被檢查\n"
+ #| msgid "%d bad signatures\n"
+ msgid "%d bad signature\n"
+ msgid_plural "%d bad signatures\n"
+ msgstr[0] "%d 份損壞的簽章\n"
- #: g10/keyedit.c:401
++#: g10/keyedit.c:909
#, fuzzy, c-format
- #| msgid "%d user IDs without valid self-signatures detected\n"
- msgid "%d user ID without valid self-signature detected\n"
- msgid_plural "%d user IDs without valid self-signatures detected\n"
- msgstr[0] "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
+ #| msgid "Good signature from"
+ msgid "%d signature reordered\n"
+ msgid_plural "%d signatures reordered\n"
+ msgstr[0] "完好的簽章來自於"
+
++#: g10/keyedit.c:914
+ #, c-format
+ msgid ""
+ "Warning: errors found and only checked self-signatures, run '%s' to check "
+ "all signatures.\n"
+ msgstr ""
- #: g10/keyedit.c:462 g10/pkclist.c:276
++#: g10/keyedit.c:974 g10/pkclist.c:275
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3636,17 -2875,14 +3696,17 @@@ msgstr "
"請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
"(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
- #: g10/keyedit.c:466 g10/pkclist.c:288
++#: g10/keyedit.c:978 g10/pkclist.c:287
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉強信任\n"
- #: g10/keyedit.c:467 g10/pkclist.c:290
++#: g10/keyedit.c:979 g10/pkclist.c:289
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全信任\n"
- #: g10/keyedit.c:485
++#: g10/keyedit.c:997
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3656,50 -2892,38 +3716,50 @@@ msgstr "
"深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
"同時也信任這把金鑰所簽署的信任簽章.\n"
- #: g10/keyedit.c:501
++#: g10/keyedit.c:1014
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
- #: g10/keyedit.c:629
++#: g10/keyedit.c:1142
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:637
++#: g10/keyedit.c:1150
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "使用者 ID \"%s\" 已撤銷."
- #: g10/keyedit.c:646 g10/keyedit.c:674 g10/keyedit.c:701 g10/keyedit.c:885
- #: g10/keyedit.c:1760
++#: g10/keyedit.c:1159 g10/keyedit.c:1187 g10/keyedit.c:1214 g10/keyedit.c:1398
++#: g10/keyedit.c:2226
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "你仍然想要簽署它嗎? (y/N) "
- #: g10/keyedit.c:660 g10/keyedit.c:688 g10/keyedit.c:715 g10/keyedit.c:891
- #: g10/keyedit.c:1765 g10/keyedit.c:2548
++#: g10/keyedit.c:1173 g10/keyedit.c:1201 g10/keyedit.c:1228 g10/keyedit.c:1404
++#: g10/keyedit.c:2231 g10/keyedit.c:3022
msgid " Unable to sign.\n"
msgstr " 無法簽署.\n"
- #: g10/keyedit.c:665
++#: g10/keyedit.c:1178
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "使用者 ID \"%s\" 已過期."
- #: g10/keyedit.c:693
++#: g10/keyedit.c:1206
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "使用者 ID \"%s\" 未經自我簽署."
- #: g10/keyedit.c:722
++#: g10/keyedit.c:1235
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "使用者 ID \"%s\" 可被簽署."
- #: g10/keyedit.c:724
++#: g10/keyedit.c:1237
msgid "Sign it? (y/N) "
msgstr "是否要簽署? (y/N) "
- #: g10/keyedit.c:751
++#: g10/keyedit.c:1264
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3708,11 -2932,9 +3768,11 @@@ msgstr "
"\"%s\" 裡的自我簽章\n"
"是 PGP 2.x 型態的簽章.\n"
- #: g10/keyedit.c:760
++#: g10/keyedit.c:1273
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
- #: g10/keyedit.c:773
++#: g10/keyedit.c:1286
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3721,11 -2943,9 +3781,11 @@@ msgstr "
"你目前在 \"%s\" 的簽章\n"
"已經過期了.\n"
- #: g10/keyedit.c:778
++#: g10/keyedit.c:1291
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
- #: g10/keyedit.c:799
++#: g10/keyedit.c:1312
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3734,43 -2954,34 +3794,43 @@@ msgstr "
"你目前在 \"%s\" 的簽章\n"
"是一份本機簽章.\n"
- #: g10/keyedit.c:804
++#: g10/keyedit.c:1317
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
- #: g10/keyedit.c:824
++#: g10/keyedit.c:1337
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
- #: g10/keyedit.c:828
++#: g10/keyedit.c:1341
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
- #: g10/keyedit.c:833
++#: g10/keyedit.c:1346
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "你仍然想要再次簽署它嗎? (y/N) "
- #: g10/keyedit.c:855
++#: g10/keyedit.c:1368
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "沒有東西可以讓金鑰 %s 簽署\n"
- #: g10/keyedit.c:879
++#: g10/keyedit.c:1392
msgid "This key has expired!"
msgstr "這把金鑰已經過期了!"
- #: g10/keyedit.c:897
++#: g10/keyedit.c:1410
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "這把金鑰將在 %s 過期.\n"
- #: g10/keyedit.c:903
++#: g10/keyedit.c:1416
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
- #: g10/keyedit.c:944
++#: g10/keyedit.c:1457
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3779,31 -2990,25 +3839,31 @@@ msgstr "
"你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
"如果你不知道這個問題的答案, 請輸入 \"0\".\n"
- #: g10/keyedit.c:949
++#: g10/keyedit.c:1462
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答.%s\n"
- #: g10/keyedit.c:951
++#: g10/keyedit.c:1464
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本沒有檢查過.%s\n"
- #: g10/keyedit.c:953
++#: g10/keyedit.c:1466
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我隨意檢查過了.%s\n"
- #: g10/keyedit.c:956
++#: g10/keyedit.c:1469
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地檢查過了.%s\n"
- #: g10/keyedit.c:963
++#: g10/keyedit.c:1476
msgid "Your selection? (enter '?' for more information): "
msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
- #: g10/keyedit.c:990
++#: g10/keyedit.c:1503
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3812,224 -3017,166 +3872,220 @@@ msgstr "
"你真的確定要用你的金鑰 \"%s\" (%s)\n"
"來簽署這把金鑰嗎\n"
- #: g10/keyedit.c:998
++#: g10/keyedit.c:1511
msgid "This will be a self-signature.\n"
msgstr "這將會是一份自我簽章.\n"
- #: g10/keyedit.c:1003
++#: g10/keyedit.c:1516
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
- #: g10/keyedit.c:1010
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
- #: g10/keyedit.c:1020
++#: g10/keyedit.c:1533
msgid "The signature will be marked as non-exportable.\n"
msgstr "這份簽章會被標記成不可匯出.\n"
- #: g10/keyedit.c:1027
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-revocable.\n"
msgstr "這份簽章會被標記成不可撤銷.\n"
- #: g10/keyedit.c:1034
++#: g10/keyedit.c:1547
msgid "I have not checked this key at all.\n"
msgstr "我根本沒有檢查過這把金鑰.\n"
- #: g10/keyedit.c:1039
++#: g10/keyedit.c:1552
msgid "I have checked this key casually.\n"
msgstr "我隨意檢查過這把金鑰了.\n"
- #: g10/keyedit.c:1044
++#: g10/keyedit.c:1557
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地檢查過這把金鑰了.\n"
- #: g10/keyedit.c:1056
++#: g10/keyedit.c:1569
msgid "Really sign? (y/N) "
msgstr "真的要簽署嗎? (y/N)"
- #: g10/keyedit.c:1107 g10/keyedit.c:5367 g10/keyedit.c:5459 g10/keyedit.c:5524
- #: g10/keyedit.c:5586 g10/sign.c:295
++#: g10/keyedit.c:1620 g10/keyedit.c:5991 g10/keyedit.c:6083 g10/keyedit.c:6148
++#: g10/keyedit.c:6210 g10/sign.c:294
#, c-format
msgid "signing failed: %s\n"
msgstr "簽署時失敗: %s\n"
- #: g10/keyedit.c:1194
++#: g10/keyedit.c:1707
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
- #: g10/keyedit.c:1223
++#: g10/keyedit.c:1736
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "金鑰 %s: 變更密語時出錯: %s\n"
- #: g10/keyedit.c:1270
- msgid "moving a key signature to the correct place\n"
- msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
-
- #: g10/keyedit.c:1385
++#: g10/keyedit.c:1850
msgid "save and quit"
msgstr "儲存並離開"
- #: g10/keyedit.c:1388
++#: g10/keyedit.c:1853
msgid "show key fingerprint"
msgstr "顯示金鑰指紋"
- #: g10/keyedit.c:1389
++#: g10/keyedit.c:1854
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "請輸入金鑰鑰柄: "
- #: g10/keyedit.c:1390
++#: g10/keyedit.c:1855
msgid "list key and user IDs"
msgstr "列出金鑰和使用者 ID"
- #: g10/keyedit.c:1392
++#: g10/keyedit.c:1857
msgid "select user ID N"
msgstr "選擇使用者 ID N"
- #: g10/keyedit.c:1393
++#: g10/keyedit.c:1858
msgid "select subkey N"
msgstr "選擇子鑰 N"
- #: g10/keyedit.c:1394
++#: g10/keyedit.c:1859
msgid "check signatures"
msgstr "檢查簽章"
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1865
msgid "sign selected user IDs [* see below for related commands]"
msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
- #: g10/keyedit.c:1404
++#: g10/keyedit.c:1870
msgid "sign selected user IDs locally"
msgstr "僅在本機簽署所選的使用者 ID"
- #: g10/keyedit.c:1405
++#: g10/keyedit.c:1871
msgid "sign selected user IDs with a trust signature"
msgstr "用信任簽章來簽署所選的使用者 ID"
- #: g10/keyedit.c:1407
++#: g10/keyedit.c:1873
msgid "sign selected user IDs with a non-revocable signature"
msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
- #: g10/keyedit.c:1409
++#: g10/keyedit.c:1875
msgid "add a user ID"
msgstr "增加使用者 ID"
- #: g10/keyedit.c:1411
++#: g10/keyedit.c:1877
msgid "add a photo ID"
msgstr "增加照片 ID"
- #: g10/keyedit.c:1412
++#: g10/keyedit.c:1878
msgid "delete selected user IDs"
msgstr "刪除所選的使用者 ID"
- #: g10/keyedit.c:1415
++#: g10/keyedit.c:1881
msgid "add a subkey"
msgstr "增加子鑰"
- #: g10/keyedit.c:1418
++#: g10/keyedit.c:1884
msgid "add a key to a smartcard"
msgstr "將金鑰加到智慧卡"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1886
msgid "move a key to a smartcard"
msgstr "將金鑰移動到智慧卡"
- #: g10/keyedit.c:1422
++#: g10/keyedit.c:1888
msgid "move a backup key to a smartcard"
msgstr "將備份金鑰移動到智慧卡"
- #: g10/keyedit.c:1424
++#: g10/keyedit.c:1890
msgid "delete selected subkeys"
msgstr "刪除所選的子鑰"
- #: g10/keyedit.c:1426
++#: g10/keyedit.c:1892
msgid "add a revocation key"
msgstr "增加撤銷金鑰"
- #: g10/keyedit.c:1428
++#: g10/keyedit.c:1894
msgid "delete signatures from the selected user IDs"
msgstr "從所選的使用者 ID 中刪除簽章"
- #: g10/keyedit.c:1430
++#: g10/keyedit.c:1896
msgid "change the expiration date for the key or selected subkeys"
msgstr "變更金鑰或所選子鑰的使用期限"
- #: g10/keyedit.c:1432
++#: g10/keyedit.c:1898
msgid "flag the selected user ID as primary"
msgstr "把所選的使用者 ID 標為主要"
- #: g10/keyedit.c:1435
++#: g10/keyedit.c:1901
msgid "list preferences (expert)"
msgstr "列出偏好 (專家模式)"
- #: g10/keyedit.c:1436
++#: g10/keyedit.c:1902
msgid "list preferences (verbose)"
msgstr "列出偏好 (囉唆模式)"
- #: g10/keyedit.c:1438
++#: g10/keyedit.c:1904
msgid "set preference list for the selected user IDs"
msgstr "設定所選使用者 ID 的偏好清單"
- #: g10/keyedit.c:1441
++#: g10/keyedit.c:1907
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
- #: g10/keyedit.c:1443
++#: g10/keyedit.c:1909
msgid "set a notation for the selected user IDs"
msgstr "為所選的使用者 ID 設定註記"
- #: g10/keyedit.c:1445
++#: g10/keyedit.c:1911
msgid "change the passphrase"
msgstr "更改密語"
- #: g10/keyedit.c:1448
++#: g10/keyedit.c:1914
msgid "change the ownertrust"
msgstr "更改主觀信任"
- #: g10/keyedit.c:1451
++#: g10/keyedit.c:1917
msgid "revoke signatures on the selected user IDs"
msgstr "撤銷所選使用者 ID 的簽章"
- #: g10/keyedit.c:1453
++#: g10/keyedit.c:1919
msgid "revoke selected user IDs"
msgstr "撤銷所選的使用者 ID"
- #: g10/keyedit.c:1456
++#: g10/keyedit.c:1922
msgid "revoke key or selected subkeys"
msgstr "撤銷金鑰或所選的子鑰"
- #: g10/keyedit.c:1458
++#: g10/keyedit.c:1924
msgid "enable key"
msgstr "啟用金鑰"
- #: g10/keyedit.c:1459
++#: g10/keyedit.c:1925
msgid "disable key"
msgstr "停用金鑰"
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1927
msgid "show selected photo IDs"
msgstr "顯示所選的照片 ID"
- #: g10/keyedit.c:1463
++#: g10/keyedit.c:1929
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
- #: g10/keyedit.c:1465
++#: g10/keyedit.c:1931
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
- #: g10/keyedit.c:1577
++#: g10/keyedit.c:2043
msgid "Secret key is available.\n"
msgstr "私鑰可用.\n"
- #: g10/keyedit.c:1677
++#: g10/keyedit.c:2143
msgid "Need the secret key to do this.\n"
msgstr "要有私鑰纔能這麼做.\n"
- #: g10/keyedit.c:1698
++#: g10/keyedit.c:2164
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4040,248 -3187,196 +4096,254 @@@ msgstr "
" 加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
" (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
- #: g10/keyedit.c:1753 g10/keyedit.c:2548
++#: g10/keyedit.c:2219 g10/keyedit.c:3022
msgid "Key is revoked."
msgstr "金鑰已撤銷."
- #: g10/keyedit.c:1776
++#: g10/keyedit.c:2242
msgid "Really sign all user IDs? (y/N) "
msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:1780
++#: g10/keyedit.c:2246
#, 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:1788
++#: g10/keyedit.c:2254
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示: 選擇使用者 ID 來加以簽署\n"
- #: g10/keyedit.c:1799
++#: g10/keyedit.c:2265
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "未知的簽章種類 '%s'\n"
- #: g10/keyedit.c:1823
++#: g10/keyedit.c:2289
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允許使用這個指令.\n"
- #: g10/keyedit.c:1845 g10/keyedit.c:1869 g10/keyedit.c:2063
++#: g10/keyedit.c:2311 g10/keyedit.c:2335 g10/keyedit.c:2529
msgid "You must select at least one user ID.\n"
msgstr "你至少得選擇一個使用者 ID.\n"
- #: g10/keyedit.c:1847 g10/keyedit.c:1871 g10/keyedit.c:2025 g10/keyedit.c:2065
++#: g10/keyedit.c:2313 g10/keyedit.c:2337 g10/keyedit.c:2491 g10/keyedit.c:2531
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:1850
++#: g10/keyedit.c:2316
msgid "You can't delete the last user ID!\n"
msgstr "你不能刪除最後一個使用者 ID!\n"
- #: g10/keyedit.c:1853
++#: g10/keyedit.c:2319
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:1854
++#: g10/keyedit.c:2320
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:1911
++#: g10/keyedit.c:2377
msgid "Really move the primary key? (y/N) "
msgstr "真的要移動主鑰嗎? (y/N) "
- #: g10/keyedit.c:1923
++#: g10/keyedit.c:2389 g10/keyedit.c:4647
msgid "You must select exactly one key.\n"
msgstr "你一定祇得選擇一把金鑰.\n"
- #: g10/keyedit.c:1950
++#: g10/keyedit.c:2416
msgid "Command expects a filename argument\n"
msgstr "這項指令要拿一個檔名來當作引數\n"
- #: g10/keyedit.c:1971
++#: g10/keyedit.c:2437
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "無法開啟 '%s': %s\n"
- #: g10/keyedit.c:1988
++#: g10/keyedit.c:2454
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
- #: g10/keyedit.c:2023
++#: g10/keyedit.c:2489
msgid "You must select at least one key.\n"
msgstr "你至少得選擇一把金鑰.\n"
- #: g10/keyedit.c:2029
++#: g10/keyedit.c:2495
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
- #: g10/keyedit.c:2031
++#: g10/keyedit.c:2497
msgid "Do you really want to delete this key? (y/N) "
msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
- #: g10/keyedit.c:2069
++#: g10/keyedit.c:2535
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2070
++#: g10/keyedit.c:2536
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2088
++#: g10/keyedit.c:2554
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
- #: g10/keyedit.c:2099
++#: g10/keyedit.c:2565
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
- #: g10/keyedit.c:2101
++#: g10/keyedit.c:2567
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
- #: g10/keyedit.c:2150
++#: g10/keyedit.c:2625
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
- #: g10/keyedit.c:2195
++#: g10/keyedit.c:2670
msgid "Set preference list to:\n"
msgstr "設定偏好清單至:\n"
- #: g10/keyedit.c:2202
++#: g10/keyedit.c:2677
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
- #: g10/keyedit.c:2204
++#: g10/keyedit.c:2679
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新偏好設定嗎? (y/N) "
- #: g10/keyedit.c:2278
++#: g10/keyedit.c:2753
msgid "Save changes? (y/N) "
msgstr "要儲存變更嗎? (y/N) "
- #: g10/keyedit.c:2282
++#: g10/keyedit.c:2757
msgid "Quit without saving? (y/N) "
msgstr "要不儲存就離開嗎? (y/N) "
- #: g10/keyedit.c:2293 g10/keyedit.c:2303 g10/keyedit.c:2445 g10/keyedit.c:2593
++#: g10/keyedit.c:2768 g10/keyedit.c:2778 g10/keyedit.c:2920 g10/keyedit.c:3112
#, c-format
msgid "update failed: %s\n"
msgstr "更新失敗: %s\n"
- #: g10/keyedit.c:2309 g10/keyedit.c:2598
++#: g10/keyedit.c:2784 g10/keyedit.c:3117
msgid "Key not changed so no update needed.\n"
msgstr "金鑰沒有變更所以不需要更新.\n"
- #: g10/keyedit.c:2494
++#: g10/keyedit.c:2968
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" 不是指紋\n"
- #: g10/keyedit.c:2526
++#: g10/keyedit.c:3000
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" 不是主要指紋\n"
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3093 g10/keyedit.c:3096
+ #, fuzzy, c-format
+ #| msgid "invalid value\n"
+ msgid "Invalid user ID '%s': %s\n"
+ msgstr "無效的數值\n"
+
++#: g10/keyedit.c:3099
msgid "No matching user IDs."
msgstr "沒有相符的使用者 ID."
- #: g10/keyedit.c:2580
++#: g10/keyedit.c:3099
msgid "Nothing to sign.\n"
msgstr "沒有東西可以簽署.\n"
- #: g10/keyedit.c:2692
++#: g10/keyedit.c:3211
msgid "Digest: "
msgstr "摘要: "
- #: g10/keyedit.c:2749
++#: g10/keyedit.c:3268
msgid "Features: "
msgstr "特點: "
- #: g10/keyedit.c:2760
++#: g10/keyedit.c:3279
msgid "Keyserver no-modify"
msgstr "金鑰伺服器無修改"
- #: g10/keyedit.c:2775 g10/keylist.c:377
++#: g10/keyedit.c:3294 g10/keylist.c:376
msgid "Preferred keyserver: "
msgstr "偏好的金鑰伺服器: "
- #: g10/keyedit.c:2783 g10/keyedit.c:2784
++#: g10/keyedit.c:3302 g10/keyedit.c:3303
msgid "Notations: "
msgstr "註記: "
- #: g10/keyedit.c:3029
++#: g10/keyedit.c:3548
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
- #: g10/keyedit.c:3101
++#: g10/keyedit.c:3620
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
- #: g10/keyedit.c:3125
++#: g10/keyedit.c:3644
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
- #: g10/keyedit.c:3131
++#: g10/keyedit.c:3650
msgid "(sensitive)"
msgstr "(機密)"
- #: g10/keyedit.c:3173 g10/keyedit.c:3315 g10/keylist.c:262 g10/keyserver.c:535
++#: g10/keyedit.c:3692 g10/keyedit.c:3834 g10/keylist.c:261 g10/keyserver.c:534
#, c-format
msgid "created: %s"
msgstr "建立: %s"
- #: g10/keyedit.c:3176 g10/keylist.c:1071 g10/keylist.c:1203
- #: g10/mainproc.c:1030
++#: g10/keyedit.c:3695 g10/keylist.c:1070 g10/keylist.c:1224
++#: g10/mainproc.c:1029
#, c-format
msgid "revoked: %s"
msgstr "撤銷: %s"
# of subkey
- #: g10/keyedit.c:3178 g10/keylist.c:1077 g10/keylist.c:1209
++#: g10/keyedit.c:3697 g10/keylist.c:1076 g10/keylist.c:1230
#, c-format
msgid "expired: %s"
msgstr "過期: %s"
# of subkey
- #: g10/keyedit.c:3180 g10/keyedit.c:3317 g10/keylist.c:264 g10/keylist.c:1083
- #: g10/keylist.c:1215 g10/keyserver.c:541 g10/mainproc.c:1036
++#: g10/keyedit.c:3699 g10/keyedit.c:3836 g10/keylist.c:263 g10/keylist.c:1082
++#: g10/keylist.c:1236 g10/keyserver.c:540 g10/mainproc.c:1035
#, c-format
msgid "expires: %s"
msgstr "到期: %s"
- #: g10/keyedit.c:3182
++#: g10/keyedit.c:3701
#, c-format
msgid "usage: %s"
msgstr "用途: %s"
- #: g10/keyedit.c:3190 g10/keyedit.c:3210 g10/keylist.c:267
++#: g10/keyedit.c:3709 g10/keyedit.c:3729 g10/keylist.c:266
msgid "card-no: "
msgstr "卡片編號: "
- #: g10/keyedit.c:3249
++#: g10/keyedit.c:3768
#, c-format
msgid "trust: %s"
msgstr "信任: %s"
- #: g10/keyedit.c:3253
++#: g10/keyedit.c:3772
#, c-format
msgid "validity: %s"
msgstr "有效性: %s"
- #: g10/keyedit.c:3260
++#: g10/keyedit.c:3779
msgid "This key has been disabled"
msgstr "這把金鑰已經停用了"
- #: g10/keyedit.c:3278
++#: g10/keyedit.c:3797
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4289,17 -3384,12 +4351,17 @@@ msgstr "
"請注意顯示出來的金鑰有效性不需要更正,\n"
"除非你重新執行程式.\n"
- #: g10/keyedit.c:3334 g10/keyedit.c:3762 g10/keyserver.c:545
- #: g10/mainproc.c:1969 g10/trust.c:380 g10/trust.c:685 dirmngr/ocsp.c:707
++#: g10/keyedit.c:3853 g10/keyedit.c:4281 g10/keyserver.c:544
++#: g10/mainproc.c:1968 g10/trust.c:379 g10/trust.c:684 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "已撤銷"
- #: g10/keyedit.c:3336 g10/keyedit.c:3764 g10/keyserver.c:549
- #: g10/mainproc.c:1971 g10/trust.c:105 g10/trust.c:687
++#: g10/keyedit.c:3855 g10/keyedit.c:4283 g10/keyserver.c:548
++#: g10/mainproc.c:1970 g10/trust.c:104 g10/trust.c:686
msgid "expired"
msgstr "已過期"
- #: g10/keyedit.c:3453
++#: g10/keyedit.c:3972
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"
@@@ -4307,15 -3397,12 +4369,15 @@@ msgstr "
"警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
" 導致不同的使用者 ID 被當成主要 ID.\n"
- #: g10/keyedit.c:3505
++#: g10/keyedit.c:4024
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "警告: 你的加密子鑰很快將到期.\n"
- #: g10/keyedit.c:3506
++#: g10/keyedit.c:4025
msgid "You may want to change its expiration date too.\n"
msgstr "你可能也會想變更其使用期限.\n"
- #: g10/keyedit.c:3565
++#: g10/keyedit.c:4084
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4324,72 -3411,57 +4386,72 @@@ msgstr "
"警告: 這是一把 PGP2 型態的金鑰.\n"
" 增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:3570 g10/keyedit.c:3857
++#: g10/keyedit.c:4089 g10/keyedit.c:4376
msgid "Are you sure you still want to add it? (y/N) "
msgstr "你確定仍然想要增加嗎? (y/N) "
- #: g10/keyedit.c:3576
++#: g10/keyedit.c:4095
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
- #: g10/keyedit.c:3589 g10/keygen.c:2624
++#: g10/keyedit.c:4108 g10/keygen.c:2637
msgid "Such a user ID already exists on this key!\n"
msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
- #: g10/keyedit.c:3690
++#: g10/keyedit.c:4209
msgid "Delete this good signature? (y/N/q)"
msgstr "刪除這份完好的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:3700
++#: g10/keyedit.c:4219
msgid "Delete this invalid signature? (y/N/q)"
msgstr "刪除這份無效的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:3704
++#: g10/keyedit.c:4223
msgid "Delete this unknown signature? (y/N/q)"
msgstr "刪除這份未知的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:3711
++#: g10/keyedit.c:4230
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要刪除這份自我簽章嗎? (y/N)"
- #: g10/keyedit.c:3727
++#: g10/keyedit.c:4246
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
msgstr[0] "已經刪除了 %d 份簽章.\n"
- #: g10/keyedit.c:3731
++#: g10/keyedit.c:4250
msgid "Nothing deleted.\n"
msgstr "沒有刪除任何東西.\n"
- #: g10/keyedit.c:3766 g10/trust.c:689
++#: g10/keyedit.c:4285 g10/trust.c:688
msgid "invalid"
msgstr "無效"
- #: g10/keyedit.c:3768
++#: g10/keyedit.c:4287
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "使用者 ID \"%s\" 已精簡: %s\n"
- #: g10/keyedit.c:3774
++#: g10/keyedit.c:4293
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
- #: g10/keyedit.c:3782
++#: g10/keyedit.c:4301
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "使用者 ID \"%s\": 已經最小化了\n"
- #: g10/keyedit.c:3783
++#: g10/keyedit.c:4302
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
- #: g10/keyedit.c:3852
++#: g10/keyedit.c:4371
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4398,39 -3470,31 +4460,39 @@@ msgstr "
"警告: 這是一把 PGP2 型態的金鑰.\n"
" 增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:3863
++#: g10/keyedit.c:4382
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
- #: g10/keyedit.c:3880
++#: g10/keyedit.c:4399
msgid "Enter the user ID of the designated revoker: "
msgstr "輸入指定撤銷者的使用者 ID: "
- #: g10/keyedit.c:3905
++#: g10/keyedit.c:4424
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:3920
++#: g10/keyedit.c:4439
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
- #: g10/keyedit.c:3942
++#: g10/keyedit.c:4461
msgid "this key has already been designated as a revoker\n"
msgstr "已指定這把金鑰為撤銷者了\n"
- #: g10/keyedit.c:3961
++#: g10/keyedit.c:4479
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
- #: g10/keyedit.c:3967
++#: g10/keyedit.c:4485
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
- #: g10/keyedit.c:4018
++#: g10/keyedit.c:4536
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4439,223 -3503,173 +4501,223 @@@ msgid "
"N) "
msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
- #: g10/keyedit.c:4023
++#: g10/keyedit.c:4541
msgid "Changing expiration time for a subkey.\n"
msgstr "正在變更子鑰的使用期限.\n"
- #: g10/keyedit.c:4026
++#: g10/keyedit.c:4544
msgid "Changing expiration time for the primary key.\n"
msgstr "正在變更主鑰的使用期限.\n"
- #: g10/keyedit.c:4077
++#: g10/keyedit.c:4595
msgid "You can't change the expiration date of a v3 key\n"
msgstr "你不能變更 v3 金鑰的使用期限\n"
- #: g10/keyedit.c:4144
++#: g10/keyedit.c:4768
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "簽署子鑰 %s 已經交叉認證過了\n"
- #: g10/keyedit.c:4150
++#: g10/keyedit.c:4774
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
- #: g10/keyedit.c:4265
++#: g10/keyedit.c:4889
msgid "Please select exactly one user ID.\n"
msgstr "請祇選擇一個使用者 ID.\n"
- #: g10/keyedit.c:4306 g10/keyedit.c:4420 g10/keyedit.c:4533 g10/keyedit.c:4670
++#: g10/keyedit.c:4930 g10/keyedit.c:5044 g10/keyedit.c:5157 g10/keyedit.c:5294
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
- #: g10/keyedit.c:4477
++#: g10/keyedit.c:5101
msgid "Enter your preferred keyserver URL: "
msgstr "請輸入你的偏好金鑰伺服器 URL: "
- #: g10/keyedit.c:4556
++#: g10/keyedit.c:5180
msgid "Are you sure you want to replace it? (y/N) "
msgstr "你確定要取代它嗎？ (y/N) "
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:5181
msgid "Are you sure you want to delete it? (y/N) "
msgstr "你確定要刪除它嗎？ (y/N) "
- #: g10/keyedit.c:4616
++#: g10/keyedit.c:5240
msgid "Enter the notation: "
msgstr "請輸入註記: "
- #: g10/keyedit.c:4763
++#: g10/keyedit.c:5387
msgid "Proceed? (y/N) "
msgstr "是否繼續? (y/N) "
- #: g10/keyedit.c:4833
++#: g10/keyedit.c:5457
#, c-format
msgid "No user ID with index %d\n"
msgstr "索引 %d 沒有對應到使用者 ID\n"
- #: g10/keyedit.c:4895
++#: g10/keyedit.c:5519
#, c-format
msgid "No user ID with hash %s\n"
msgstr "雜湊 %s 沒有對應到使用者 ID\n"
- #: g10/keyedit.c:4996
++#: g10/keyedit.c:5620
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "索引 %d 沒有對應到子鑰\n"
- #: g10/keyedit.c:5018
++#: g10/keyedit.c:5642
#, c-format
msgid "No subkey with index %d\n"
msgstr "索引 %d 沒有對應到子鑰\n"
- #: g10/keyedit.c:5159
++#: g10/keyedit.c:5783
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "使用者 ID: \"%s\"\n"
- #: g10/keyedit.c:5162 g10/keyedit.c:5264 g10/keyedit.c:5312
++#: g10/keyedit.c:5786 g10/keyedit.c:5888 g10/keyedit.c:5936
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
- #: g10/keyedit.c:5164 g10/keyedit.c:5266 g10/keyedit.c:5314
++#: g10/keyedit.c:5788 g10/keyedit.c:5890 g10/keyedit.c:5938
msgid " (non-exportable)"
msgstr " (不可匯出)"
- #: g10/keyedit.c:5168
++#: g10/keyedit.c:5792
#, c-format
msgid "This signature expired on %s.\n"
msgstr "這份簽章已經在 %s 過期了.\n"
- #: g10/keyedit.c:5173
++#: g10/keyedit.c:5797
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "你確定仍然想要撤銷它嗎? (y/N) "
- #: g10/keyedit.c:5178
++#: g10/keyedit.c:5802
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
- #: g10/keyedit.c:5232
++#: g10/keyedit.c:5856
msgid "Not signed by you.\n"
msgstr "並非由你所簽署.\n"
- #: g10/keyedit.c:5238
++#: g10/keyedit.c:5862
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
- #: g10/keyedit.c:5267
++#: g10/keyedit.c:5891
msgid " (non-revocable)"
msgstr " (不可撤銷)"
- #: g10/keyedit.c:5274
++#: g10/keyedit.c:5898
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
- #: g10/keyedit.c:5299
++#: g10/keyedit.c:5923
msgid "You are about to revoke these signatures:\n"
msgstr "你正要撤銷這些簽章:\n"
- #: g10/keyedit.c:5322
++#: g10/keyedit.c:5946
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要建立撤銷憑證嗎? (y/N) "
- #: g10/keyedit.c:5355
++#: g10/keyedit.c:5979
msgid "no secret key\n"
msgstr "沒有私鑰\n"
- #: g10/keyedit.c:5424
++#: g10/keyedit.c:6048
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "使用者 ID \"%s\" 已撤銷\n"
- #: g10/keyedit.c:5441
++#: g10/keyedit.c:6065
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
- #: g10/keyedit.c:5509
++#: g10/keyedit.c:6133
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "金鑰 %s 已撤銷.\n"
- #: g10/keyedit.c:5571
++#: g10/keyedit.c:6195
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子鑰 %s 已撤銷.\n"
- #: g10/keyedit.c:5668
++#: g10/keyedit.c:6292
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
- #: g10/keygen.c:273
++#: g10/keygen.c:284
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "偏好設定 '%s' 重複了\n"
- #: g10/keygen.c:280
++#: g10/keygen.c:291
msgid "too many cipher preferences\n"
msgstr "編密偏好過多\n"
- #: g10/keygen.c:282
++#: g10/keygen.c:293
msgid "too many digest preferences\n"
msgstr "摘要偏好過多\n"
- #: g10/keygen.c:284
++#: g10/keygen.c:295
msgid "too many compression preferences\n"
msgstr "壓縮偏好過多\n"
- #: g10/keygen.c:425
++#: g10/keygen.c:436
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "偏好字串中含有無效的項目 '%s'\n"
- #: g10/keygen.c:904
++#: g10/keygen.c:915
msgid "writing direct signature\n"
msgstr "寫入直接簽章中\n"
- #: g10/keygen.c:950
++#: g10/keygen.c:961
msgid "writing self signature\n"
msgstr "寫入自我簽章中\n"
- #: g10/keygen.c:1006
++#: g10/keygen.c:1017
msgid "writing key binding signature\n"
msgstr "寫入附鑰簽章中\n"
- #: g10/keygen.c:1367 g10/keygen.c:1372 g10/keygen.c:1422 g10/keygen.c:1427
- #: g10/keygen.c:1570 g10/keygen.c:1575
++#: g10/keygen.c:1378 g10/keygen.c:1383 g10/keygen.c:1433 g10/keygen.c:1438
++#: g10/keygen.c:1581 g10/keygen.c:1586
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "金鑰尺寸無效; 改用 %u 位元\n"
- #: g10/keygen.c:1378 g10/keygen.c:1433 g10/keygen.c:1441 g10/keygen.c:1581
++#: g10/keygen.c:1389 g10/keygen.c:1444 g10/keygen.c:1452 g10/keygen.c:1592
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "金鑰尺寸增大到 %u 位元\n"
- #: g10/keygen.c:1467
++#: g10/keygen.c:1478
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
- #: g10/keygen.c:1636
++#: g10/keygen.c:1647
msgid "Sign"
msgstr "簽署"
- #: g10/keygen.c:1639
++#: g10/keygen.c:1650
msgid "Certify"
msgstr "保證"
- #: g10/keygen.c:1642
++#: g10/keygen.c:1653
msgid "Encrypt"
msgstr "加密"
- #: g10/keygen.c:1645
++#: g10/keygen.c:1656
msgid "Authenticate"
msgstr "鑑定"
@@@ -4669,150 -3683,119 +4731,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1663
++#: g10/keygen.c:1675
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
- #: g10/keygen.c:1687
++#: g10/keygen.c:1702
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 金鑰可能的動作: "
- #: g10/keygen.c:1691
++#: g10/keygen.c:1708
msgid "Current allowed actions: "
msgstr "目前可進行的動作: "
- #: g10/keygen.c:1696
++#: g10/keygen.c:1713
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 切換簽署性能\n"
- #: g10/keygen.c:1699
++#: g10/keygen.c:1716
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 切換加密性能\n"
- #: g10/keygen.c:1702
++#: g10/keygen.c:1719
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 切換鑑定性能\n"
- #: g10/keygen.c:1705
++#: g10/keygen.c:1722
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
- #: g10/keygen.c:1834 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1851 sm/certreqgen-ui.c:161
msgid "Please select what kind of key you want:\n"
msgstr "請選擇你要使用的金鑰種類:\n"
- #: g10/keygen.c:1838
++#: g10/keygen.c:1855
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA 和 RSA (預設)\n"
- #: g10/keygen.c:1842
++#: g10/keygen.c:1859
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA 和 Elgamal\n"
- #: g10/keygen.c:1844
++#: g10/keygen.c:1861
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (僅能用於簽署)\n"
- #: g10/keygen.c:1846
++#: g10/keygen.c:1863
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (僅能用於簽署)\n"
- #: g10/keygen.c:1851
++#: g10/keygen.c:1868
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (僅能用於加密)\n"
- #: g10/keygen.c:1853
++#: g10/keygen.c:1870
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (僅能用於加密)\n"
- #: g10/keygen.c:1858
++#: g10/keygen.c:1875
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (你能自己設定性能)\n"
- #: g10/keygen.c:1860
++#: g10/keygen.c:1877
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (你能自己設定性能)\n"
- #: g10/keygen.c:1866
++#: g10/keygen.c:1883
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC 和 ECC\n"
- #: g10/keygen.c:1868
++#: g10/keygen.c:1885
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (僅能用於簽署)\n"
- #: g10/keygen.c:1870
++#: g10/keygen.c:1887
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (你能自己設定性能)\n"
- #: g10/keygen.c:1872
++#: g10/keygen.c:1889
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (僅能用於加密)\n"
- #: g10/keygen.c:1876
++#: g10/keygen.c:1893
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) 現有的金鑰\n"
- #: g10/keygen.c:1966 sm/certreqgen-ui.c:206
++#: g10/keygen.c:1983 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
msgstr "請輸入金鑰鑰柄: "
- #: g10/keygen.c:1979 sm/certreqgen-ui.c:214
++#: g10/keygen.c:1996 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
- #: g10/keygen.c:1981 sm/certreqgen-ui.c:216
++#: g10/keygen.c:1998 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
msgstr "沒有金鑰有此金鑰鑰柄\n"
- #: g10/keygen.c:2053
++#: g10/keygen.c:2070
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
- #: g10/keygen.c:2061
++#: g10/keygen.c:2078
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/keygen.c:2064 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2081 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "你想要用多大的金鑰尺寸? (%u) "
- #: g10/keygen.c:2078 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2095 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "你所要求的金鑰尺寸是 %u 位元\n"
- #: g10/keygen.c:2096 g10/keygen.c:2110
++#: g10/keygen.c:2113 g10/keygen.c:2127
#, c-format
msgid "rounded to %u bits\n"
msgstr "加大到 %u 位元\n"
- #: g10/keygen.c:2155
++#: g10/keygen.c:2178
msgid "Please select which elliptic curve you want:\n"
msgstr "請選擇你要使用的橢圓曲線:\n"
- #: g10/keygen.c:2330
++#: g10/keygen.c:2343
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4828,7 -3811,6 +4890,7 @@@ msgstr "
" <n>m = 金鑰在 n 月後會到期\n"
" <n>y = 金鑰在 n 年後會到期\n"
- #: g10/keygen.c:2341
++#: g10/keygen.c:2354
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4844,38 -3826,30 +4906,38 @@@ msgstr "
" <n>m = 簽章在 n 月後會到期\n"
" <n>y = 簽章在 n 年後會到期\n"
- #: g10/keygen.c:2364
++#: g10/keygen.c:2377
msgid "Key is valid for? (0) "
msgstr "金鑰的有效期限是多久? (0) "
- #: g10/keygen.c:2369
++#: g10/keygen.c:2382
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "簽章的有效期限是多久? (%s) "
- #: g10/keygen.c:2388 g10/keygen.c:2413
++#: g10/keygen.c:2401 g10/keygen.c:2426
msgid "invalid value\n"
msgstr "無效的數值\n"
- #: g10/keygen.c:2395
++#: g10/keygen.c:2408
msgid "Key does not expire at all\n"
msgstr "金鑰完全不會過期\n"
- #: g10/keygen.c:2396
++#: g10/keygen.c:2409
msgid "Signature does not expire at all\n"
msgstr "簽章完全不會過期\n"
- #: g10/keygen.c:2401
++#: g10/keygen.c:2414
#, c-format
msgid "Key expires at %s\n"
msgstr "金鑰將會在 %s 到期\n"
- #: g10/keygen.c:2402
++#: g10/keygen.c:2415
#, c-format
msgid "Signature expires at %s\n"
msgstr "簽章將會在 %s 到期.\n"
- #: g10/keygen.c:2406
++#: g10/keygen.c:2419
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -4883,11 -3857,9 +4945,11 @@@ msgstr "
"你的系統無法顯示 2038 年以後的日期.\n"
"不過, 它可以正確處理直到 2106 年之前的年份.\n"
- #: g10/keygen.c:2419
++#: g10/keygen.c:2432
msgid "Is this correct? (y/N) "
msgstr "以上正確嗎? (y/N) "
- #: g10/keygen.c:2487
++#: g10/keygen.c:2500
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4901,7 -3873,6 +4963,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2502
++#: g10/keygen.c:2515
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -4916,49 -3887,38 +4978,49 @@@ msgstr "
" \"Ke-Huan Lin (Jedi) <Jedi at Jedi.org>\"\n"
"\n"
- #: g10/keygen.c:2521
++#: g10/keygen.c:2534
msgid "Real name: "
msgstr "真實姓名: "
- #: g10/keygen.c:2530
++#: g10/keygen.c:2543
msgid "Invalid character in name\n"
msgstr "姓名含有無效的字符\n"
- #: g10/keygen.c:2531
++#: g10/keygen.c:2544
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2535
++#: g10/keygen.c:2548
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用數字開頭\n"
- #: g10/keygen.c:2538
++#: g10/keygen.c:2551
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五個字符長\n"
- #: g10/keygen.c:2548
++#: g10/keygen.c:2561
msgid "Email address: "
msgstr "電子郵件地址: "
- #: g10/keygen.c:2554
++#: g10/keygen.c:2567
msgid "Not a valid email address\n"
msgstr "不是有效的電子郵件地址\n"
- #: g10/keygen.c:2563
++#: g10/keygen.c:2576
msgid "Comment: "
msgstr "註釋: "
- #: g10/keygen.c:2569
++#: g10/keygen.c:2582
msgid "Invalid character in comment\n"
msgstr "註釋含有無效的字符\n"
- #: g10/keygen.c:2605
++#: g10/keygen.c:2618
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "你正在使用 '%s' 字元集.\n"
- #: g10/keygen.c:2611
++#: g10/keygen.c:2624
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4969,7 -3929,6 +5031,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2629
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
@@@ -4984,31 -3943,24 +5046,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2641
++#: g10/keygen.c:2654
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2651
++#: g10/keygen.c:2664
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
- #: g10/keygen.c:2652
++#: g10/keygen.c:2665
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
- #: g10/keygen.c:2657
++#: g10/keygen.c:2670
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
- #: g10/keygen.c:2658
++#: g10/keygen.c:2671
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
- #: g10/keygen.c:2677
++#: g10/keygen.c:2690
msgid "Please correct the error first\n"
msgstr "請先訂正錯誤\n"
- #: g10/keygen.c:2722
++#: g10/keygen.c:2735
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"
@@@ -5019,12 -3971,10 +5081,12 @@@ msgstr "
"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
- #: g10/keygen.c:3464 g10/keygen.c:4220 g10/keygen.c:4348 g10/keygen.c:4445
++#: g10/keygen.c:3477 g10/keygen.c:4246 g10/keygen.c:4374 g10/keygen.c:4471
#, c-format
msgid "Key generation failed: %s\n"
msgstr "產生金鑰失敗: %s\n"
- #: g10/keygen.c:3473
++#: g10/keygen.c:3486
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5035,62 -3985,49 +5097,62 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3475
++#: g10/keygen.c:3488
msgid "Continue? (Y/n) "
msgstr "是否繼續? (Y/n) "
- #: g10/keygen.c:3496
++#: g10/keygen.c:3509
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" 的金鑰已存在\n"
- #: g10/keygen.c:3501
++#: g10/keygen.c:3514
msgid "Create anyway? (y/N) "
msgstr "無論如何還是要建立嗎? (y/N) "
- #: g10/keygen.c:3506
++#: g10/keygen.c:3519
msgid "creating anyway\n"
msgstr "總之還是在建立\n"
- #: g10/keygen.c:3766
++#: g10/keygen.c:3779
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "請注意: 如需全能金鑰產生對話框請用 \"%s %s\".\n"
- #: g10/keygen.c:3793
++#: g10/keygen.c:3811
msgid "Key generation canceled.\n"
msgstr "金鑰產生已取消.\n"
- #: g10/keygen.c:3853
++#: g10/keygen.c:3871
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "無法建立備份檔案 '%s': %s\n"
- #: g10/keygen.c:3873
++#: g10/keygen.c:3891
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
- #: g10/keygen.c:4020 g10/keygen.c:4159
++#: g10/keygen.c:4038 g10/keygen.c:4185
#, c-format
msgid "writing public key to '%s'\n"
msgstr "正在寫入公鑰至 '%s'\n"
- #: g10/keygen.c:4153
++#: g10/keygen.c:4179
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
- #: g10/keygen.c:4167
++#: g10/keygen.c:4193
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/keygen.c:4196
++#: g10/keygen.c:4222
msgid "public and secret key created and signed.\n"
msgstr "公鑰和私鑰已建立及簽署.\n"
- #: g10/keygen.c:4207
++#: g10/keygen.c:4233
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"
@@@ -5098,634 -4035,507 +5160,641 @@@ msgstr "
"請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
"來產生加密用的子鑰.\n"
- #: g10/keygen.c:4270 g10/keygen.c:4393
++#: g10/keygen.c:4296 g10/keygen.c:4419
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/keygen.c:4272 g10/keygen.c:4395
++#: g10/keygen.c:4298 g10/keygen.c:4421
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/keygen.c:4283 g10/keygen.c:4406
++#: g10/keygen.c:4309 g10/keygen.c:4432
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
- #: g10/keygen.c:4294
++#: g10/keygen.c:4320
msgid "Secret parts of primary key are not available.\n"
msgstr "主鑰的私鑰部分無法取用.\n"
- #: g10/keygen.c:4298
++#: g10/keygen.c:4324
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鑰的私鑰部分存放於卡上.\n"
- #: g10/keygen.c:4316 g10/keygen.c:4421
++#: g10/keygen.c:4342 g10/keygen.c:4447
msgid "Really create? (y/N) "
msgstr "真的要建立嗎? (y/N) "
- #: g10/keyid.c:595 g10/keyid.c:608 g10/keyid.c:621
++#: g10/keyid.c:652 g10/keyid.c:665 g10/keyid.c:678
msgid "never "
msgstr "永遠不過期"
- #: g10/keylist.c:331
++#: g10/keylist.c:330
msgid "Critical signature policy: "
msgstr "關鍵簽章原則: "
- #: g10/keylist.c:333
++#: g10/keylist.c:332
msgid "Signature policy: "
msgstr "簽章原則: "
- #: g10/keylist.c:375
++#: g10/keylist.c:374
msgid "Critical preferred keyserver: "
msgstr "執意偏好的金鑰伺服器: "
- #: g10/keylist.c:428
++#: g10/keylist.c:427
msgid "Critical signature notation: "
msgstr "關鍵簽章註記: "
- #: g10/keylist.c:430
++#: g10/keylist.c:429
msgid "Signature notation: "
msgstr "簽章註記: "
- #: g10/keylist.c:468
++#: g10/keylist.c:467
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
msgstr[0] "%d 份損壞的簽章\n"
- #: g10/keylist.c:563
++#: g10/keylist.c:480
+ #, fuzzy, c-format
+ #| msgid "1 signature not checked due to an error\n"
+ msgid "%d signature not checked due to an error\n"
+ msgid_plural "%d signatures not checked due to errors\n"
+ msgstr[0] "有 1 份簽章因錯誤而未被檢查\n"
+
++#: g10/keylist.c:562
#, fuzzy, c-format
#| msgid "Warning: %lu key(s) skipped due to their large size\n"
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] "警告: %lu 把金鑰因尺寸太大已跳過\n"
- #: g10/keylist.c:585
++#: g10/keylist.c:584
msgid "Keyring"
msgstr "鑰匙圈"
- #: g10/keylist.c:933 g10/keyserver.c:1819 g10/skclist.c:197 g10/skclist.c:225
++#: g10/keylist.c:932 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "已跳過 \"%s\": %s\n"
- #: g10/keylist.c:1888
++#: g10/keylist.c:1909
msgid "Primary key fingerprint:"
msgstr " 主鑰指紋:"
- #: g10/keylist.c:1890
++#: g10/keylist.c:1911
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:1898
++#: g10/keylist.c:1919
msgid " Primary key fingerprint:"
msgstr " 主鑰指紋:"
- #: g10/keylist.c:1900 g10/keylist.c:1910
++#: g10/keylist.c:1921 g10/keylist.c:1931
msgid " Subkey fingerprint:"
msgstr " 子鑰指紋:"
# use tty
- #: g10/keylist.c:1905 g10/keylist.c:1915
++#: g10/keylist.c:1926 g10/keylist.c:1936
msgid " Key fingerprint ="
msgstr " 金鑰指紋 ="
- #: g10/keylist.c:1959
++#: g10/keylist.c:1980
msgid " Card serial no. ="
msgstr " 卡片序號 ="
- #: g10/keyring.c:1490
++#: g10/keyring.c:1489
#, c-format
msgid "caching keyring '%s'\n"
msgstr "快取鑰匙圈 '%s' 中\n"
- #: g10/keyring.c:1567
++#: g10/keyring.c:1566
#, fuzzy, c-format
#| msgid "%lu keys cached so far (%lu signatures)\n"
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
msgstr[0] "目前已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
- #: g10/keyring.c:1583
++#: g10/keyring.c:1582
#, fuzzy, c-format
#| msgid "flush the cache"
msgid "%lu key cached"
msgid_plural "%lu keys cached"
msgstr[0] "清除快取"
- #: g10/keyring.c:1585
++#: g10/keyring.c:1584
#, fuzzy, c-format
#| msgid "1 bad signature\n"
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
msgstr[0] "1 份損壞的簽章\n"
- #: g10/keyring.c:1660
++#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: 鑰匙圈已建立\n"
- #: g10/keyserver.c:91
++#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:93
++#: g10/keyserver.c:92
msgid "include revoked keys in search results"
msgstr "在搜尋結果中也包含已撤銷的金鑰"
- #: g10/keyserver.c:94
++#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
msgstr "以金鑰 ID 搜尋時也搜尋子鑰"
- #: g10/keyserver.c:96
++#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
msgstr ""
- #: g10/keyserver.c:100
++#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
msgstr "驗證簽章時自動取回金鑰"
- #: g10/keyserver.c:102
++#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
msgstr "尊重金鑰上所設定的偏好金鑰伺服器 URL"
- #: g10/keyserver.c:104
++#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "取回金鑰時尊重金鑰所設定的 PKA 記錄"
- #: g10/keyserver.c:547
++#: g10/keyserver.c:546
msgid "disabled"
msgstr "已停用"
- #: g10/keyserver.c:751
++#: g10/keyserver.c:750
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
- #: g10/keyserver.c:857
++#: g10/keyserver.c:856
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
- #: g10/keyserver.c:998 g10/keyserver.c:1113
++#: g10/keyserver.c:997 g10/keyserver.c:1112
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
- #: g10/keyserver.c:1418 g10/keyserver.c:1451
++#: g10/keyserver.c:1417 g10/keyserver.c:1450
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "更新 %d 份金鑰中 (從 %s )\n"
- #: g10/keyserver.c:1425
++#: g10/keyserver.c:1424
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
- #: g10/keyserver.c:1529
++#: g10/keyserver.c:1528
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
- #: g10/keyserver.c:1532
++#: g10/keyserver.c:1531
msgid "key not found on keyserver\n"
msgstr "在金鑰伺服器上找不到金鑰\n"
- #: g10/keyserver.c:1536
++#: g10/keyserver.c:1535
msgid "no keyserver known (use option --keyserver)\n"
msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
- #: g10/keyserver.c:1700
++#: g10/keyserver.c:1699
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
- #: g10/keyserver.c:1704
++#: g10/keyserver.c:1703
#, c-format
msgid "requesting key %s from %s\n"
msgstr "正在請求金鑰 %s 自 %s\n"
- #: g10/keyserver.c:1804 g10/keyserver.c:1959
++#: g10/keyserver.c:1803 g10/keyserver.c:1958
#, fuzzy
#| msgid "invalid keyserver options\n"
msgid "no keyserver known\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/keyserver.c:1822
++#: g10/keyserver.c:1821
#, c-format
msgid "sending key %s to %s\n"
msgstr "遞送金鑰 %s 至 %s\n"
- #: g10/keyserver.c:1863
++#: g10/keyserver.c:1862
#, c-format
msgid "requesting key from '%s'\n"
msgstr "正在向 '%s' 請求金鑰\n"
- #: g10/keyserver.c:1879
++#: g10/keyserver.c:1878
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告: 無法抓取 URI %s: %s\n"
- #: g10/mainproc.c:257
++#: g10/mainproc.c:256
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
- #: g10/mainproc.c:305
++#: g10/mainproc.c:304
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 加密過的階段金鑰\n"
- #: g10/mainproc.c:315
++#: g10/mainproc.c:314
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密語係以未知的 %d 摘要演算法所產生\n"
- #: g10/mainproc.c:381
++#: g10/mainproc.c:380
#, c-format
msgid "public key is %s\n"
msgstr "公鑰為 %s\n"
- #: g10/mainproc.c:459
++#: g10/mainproc.c:458
msgid "public key encrypted data: good DEK\n"
msgstr "公鑰加密過的資料: 完好的 DEK\n"
- #: g10/mainproc.c:492
++#: g10/mainproc.c:491
#, c-format
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:231
++#: g10/mainproc.c:495 g10/pkclist.c:230
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:500
++#: g10/mainproc.c:499
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "已用 %s 金鑰, ID %s 所加密\n"
- #: g10/mainproc.c:517
++#: g10/mainproc.c:516
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公鑰解密失敗: %s\n"
- #: g10/mainproc.c:533
++#: g10/mainproc.c:532
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "已用 %lu 個密語加密了\n"
- #: g10/mainproc.c:535
++#: g10/mainproc.c:534
msgid "encrypted with 1 passphrase\n"
msgstr "已用 1 個密語加密了\n"
- #: g10/mainproc.c:569 g10/mainproc.c:590
++#: g10/mainproc.c:568 g10/mainproc.c:589
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 為加密過的資料\n"
- #: g10/mainproc.c:576
++#: g10/mainproc.c:575
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
- #: g10/mainproc.c:621 g10/mainproc.c:635
++#: g10/mainproc.c:620 g10/mainproc.c:634
msgid "WARNING: message was not integrity protected\n"
msgstr "警告: 訊息未受到完整的保護\n"
- #: g10/mainproc.c:631
++#: g10/mainproc.c:630
msgid "decryption okay\n"
msgstr "解密成功\n"
- #: g10/mainproc.c:640
++#: g10/mainproc.c:639
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告: 加密過的訊息已經被變造了!\n"
- #: g10/mainproc.c:656
++#: g10/mainproc.c:655
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失敗: %s\n"
- #: g10/mainproc.c:679
++#: g10/mainproc.c:678
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
- #: g10/mainproc.c:681
++#: g10/mainproc.c:680
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始的檔名 ='%.*s'\n"
- #: g10/mainproc.c:751
++#: g10/mainproc.c:750
msgid "WARNING: multiple plaintexts seen\n"
msgstr "警告: 看到了多份明文\n"
- #: g10/mainproc.c:917
++#: g10/mainproc.c:916
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
- #: g10/mainproc.c:1232 g10/mainproc.c:1275
++#: g10/mainproc.c:1231 g10/mainproc.c:1274
msgid "no signature found\n"
msgstr "找不到簽章\n"
- #: g10/mainproc.c:1578
++#: g10/mainproc.c:1577
#, c-format
msgid "BAD signature from \"%s\""
msgstr "*損壞* 的簽章來自於 \"%s\""
- #: g10/mainproc.c:1580
++#: g10/mainproc.c:1579
#, c-format
msgid "Expired signature from \"%s\""
msgstr "過期的簽章來自於 \"%s\""
- #: g10/mainproc.c:1582
++#: g10/mainproc.c:1581
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的簽章來自於 \"%s\""
- #: g10/mainproc.c:1602
++#: g10/mainproc.c:1601
msgid "signature verification suppressed\n"
msgstr "簽章驗證已抑制\n"
- #: g10/mainproc.c:1711
++#: g10/mainproc.c:1710
msgid "can't handle this ambiguous signature data\n"
msgstr "無法處理這個不明確的簽章資料\n"
- #: g10/mainproc.c:1721
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "由 %s 建立的簽章\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 金鑰 %s\n"
- #: g10/mainproc.c:1726
++#: g10/mainproc.c:1725
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
- #: g10/mainproc.c:1746
++#: g10/mainproc.c:1745
msgid "Key available at: "
msgstr "可用的金鑰於: "
- #: g10/mainproc.c:1924
++#: g10/mainproc.c:1923
msgid "[uncertain]"
msgstr "[ 不確定 ]"
- #: g10/mainproc.c:1961
++#: g10/mainproc.c:1960
#, c-format
msgid " aka \"%s\""
msgstr " 亦即 \"%s\""
- #: g10/mainproc.c:2071
++#: g10/mainproc.c:2070
#, c-format
msgid "Signature expired %s\n"
msgstr "這份簽署已經在 %s 過期了\n"
- #: g10/mainproc.c:2075
++#: g10/mainproc.c:2074
#, c-format
msgid "Signature expires %s\n"
msgstr "這份簽署將在 %s 到期\n"
- #: g10/mainproc.c:2078
++#: g10/mainproc.c:2077
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
- #: g10/mainproc.c:2079
++#: g10/mainproc.c:2078
msgid "binary"
msgstr "二進制"
- #: g10/mainproc.c:2080
++#: g10/mainproc.c:2079
msgid "textmode"
msgstr "文字模式"
- #: g10/mainproc.c:2080 g10/trust.c:104 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2079 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "未知"
- #: g10/mainproc.c:2082
++#: g10/mainproc.c:2081
msgid ", key algorithm "
msgstr ", 金鑰演算法 "
- #: g10/mainproc.c:2117
++#: g10/mainproc.c:2116
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2143
#, c-format
msgid "Can't check signature: %s\n"
msgstr "無法檢查簽章: %s\n"
- #: g10/mainproc.c:2237 g10/mainproc.c:2256 g10/mainproc.c:2362
++#: g10/mainproc.c:2236 g10/mainproc.c:2255 g10/mainproc.c:2361
msgid "not a detached signature\n"
msgstr "不是一份分離的簽章\n"
- #: g10/mainproc.c:2285
++#: g10/mainproc.c:2284
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
- #: g10/mainproc.c:2294
++#: g10/mainproc.c:2293
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等級 0x%02x 的獨立簽章\n"
- #: g10/mainproc.c:2366
++#: g10/mainproc.c:2365
msgid "old style (PGP 2.x) signature\n"
msgstr "舊型 (PGP 2.x) 簽章\n"
- #: g10/misc.c:103 g10/misc.c:133 g10/misc.c:209
++#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
msgstr "'%s' 的 fstat 失敗於 %s: %s\n"
- #: g10/misc.c:172
++#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) 失敗於 %s: %s\n"
- #: g10/misc.c:281
++#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "警告: 正在使用實驗性的 %s 公鑰演算法\n"
- #: g10/misc.c:288
++#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "警告: 已不建議使用 Elgamal 簽署暨加密金鑰\n"
- #: g10/misc.c:302
++#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "警告: 正在使用實驗性的 %s 編密演算法\n"
- #: g10/misc.c:321
++#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
- #: g10/misc.c:330
++#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "警告: 已不建議使用 %s 摘要演算法\n"
- #: g10/misc.c:355
++#: g10/misc.c:353
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
- #: g10/misc.c:377
++#: g10/misc.c:375
#, fuzzy, c-format
#| msgid "%s:%u: read error: %s\n"
msgid "(reported error: %s)\n"
msgstr "%s:%u: 讀取錯誤: %s\n"
- #: g10/misc.c:380
++#: g10/misc.c:378
#, fuzzy, c-format
#| msgid "read error in '%s': %s\n"
msgid "(reported error: %s <%s>)\n"
msgstr "'%s' 讀取錯誤: %s\n"
- #: g10/misc.c:399
++#: g10/misc.c:397
msgid "(further info: "
msgstr ""
- #: g10/misc.c:1058
++#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
- #: g10/misc.c:1062
++#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告: 已不建議使用 \"%s\" 選項\n"
- #: g10/misc.c:1064
++#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "請改以 \"%s%s\" 代替\n"
- #: g10/misc.c:1071
++#: g10/misc.c:1069
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
- #: g10/misc.c:1081
++#: g10/misc.c:1079
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
msgstr "%s:%u: 此檔案內的 \"%s\" 已廢棄 - 僅對 %s 有影響\n"
- #: g10/misc.c:1085
++#: g10/misc.c:1083
#, 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:1149
++#: g10/misc.c:1147
msgid "Uncompressed"
msgstr "未壓縮"
#. TRANSLATORS: See doc/TRANSLATE about this string.
- #: g10/misc.c:1174
++#: g10/misc.c:1172
msgid "uncompressed|none"
msgstr "uncompressed|none|未壓縮|無"
- #: g10/misc.c:1294
++#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "這個訊息對 %s 來說無法使用\n"
- #: g10/misc.c:1469
++#: g10/misc.c:1467
#, c-format
msgid "ambiguous option '%s'\n"
msgstr "不明確的選項 '%s'\n"
- #: g10/misc.c:1494
++#: g10/misc.c:1492
#, c-format
msgid "unknown option '%s'\n"
msgstr "未知的選項 '%s'\n"
- #: g10/misc.c:1732
++#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
- #: g10/misc.c:1754
++#: g10/misc.c:1752
#, fuzzy, c-format
#| msgid "Unknown signature type '%s'\n"
msgid "unknown weak digest '%s'\n"
msgstr "未知的簽章種類 '%s'\n"
- #: g10/openfile.c:85
++#: g10/openfile.c:84
#, c-format
msgid "File '%s' exists. "
msgstr "檔案 '%s' 已存在. "
- #: g10/openfile.c:89
++#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "是否覆寫? (y/N) "
- #: g10/openfile.c:124
++#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
msgstr "%s: 未知的副檔名\n"
- #: g10/openfile.c:148
++#: g10/openfile.c:147
msgid "Enter new filename"
msgstr "請輸入新的檔名"
- #: g10/openfile.c:219
++#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "寫到標準輸出中\n"
- #: g10/openfile.c:367
++#: g10/openfile.c:366
#, c-format
msgid "assuming signed data in '%s'\n"
msgstr "假設被簽署的資料在 '%s'\n"
- #: g10/openfile.c:458
++#: g10/openfile.c:457
#, c-format
msgid "new configuration file '%s' created\n"
msgstr "新的組態檔案 '%s' 已建立\n"
- #: g10/openfile.c:499
++#: g10/openfile.c:498
#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
msgstr "警告: 在 '%s' 裡的選項於這次執行期間並沒有被啟用\n"
- #: g10/parse-packet.c:258
++#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "無法操作 %d 公開金鑰演算法\n"
- #: g10/parse-packet.c:1114
++#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
- #: g10/parse-packet.c:1632
++#: g10/parse-packet.c:1631
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 類別的子封包設定了關鍵位元\n"
- #: g10/passphrase.c:74 g10/passphrase.c:332 g10/passphrase.c:394
++#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
msgstr "代理程式的問題: %s\n"
- #: g10/passphrase.c:271 g10/passphrase.c:505 g10/passphrase.c:659
++#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
msgstr " (主要金鑰 ID %s)"
- #: g10/passphrase.c:278
++#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -5739,15 -4549,12 +5808,15 @@@ msgstr "
"%u 位元長的 %s 金鑰, ID %s,\n"
"建立於 %s%s.\n"
- #: g10/passphrase.c:297
++#: g10/passphrase.c:296
msgid "Enter passphrase\n"
msgstr "請輸入密語\n"
- #: g10/passphrase.c:326
++#: g10/passphrase.c:325
msgid "cancelled by user\n"
msgstr "由使用者所取消\n"
- #: g10/passphrase.c:484
++#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@@ -5756,41 -4563,32 +5825,41 @@@ msgstr "
"你需要用密語來解開下列使用者的\n"
"私鑰: \"%s\"\n"
- #: g10/passphrase.c:492
++#: g10/passphrase.c:491
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
- #: g10/passphrase.c:501
++#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (在主鑰 ID %s 上的子鑰)"
- #: g10/passphrase.c:666
++#: g10/passphrase.c:665
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr "請輸入密語來解鎖 OpenPGP 私鑰:"
- #: g10/passphrase.c:670
++#: g10/passphrase.c:669
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr "請輸入密語來匯入 OpenPGP 私鑰:"
- #: g10/passphrase.c:675
++#: g10/passphrase.c:674
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr "請輸入密語來匯出 OpenPGP 私子鑰:"
- #: g10/passphrase.c:678
++#: g10/passphrase.c:677
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr "請輸入密語來匯出 OpenPGP 私鑰:"
- #: g10/passphrase.c:683
++#: g10/passphrase.c:682
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
msgstr "你是否真的想要永久刪除 OpenPGP 私鑰子鑰:"
- #: g10/passphrase.c:686
++#: g10/passphrase.c:685
msgid "Do you really want to permanently delete the OpenPGP secret key:"
msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
- #: g10/passphrase.c:695
++#: g10/passphrase.c:694
#, c-format
msgid ""
"%s\n"
@@@ -5850,31 -4640,24 +5919,31 @@@ msgstr "這張照片正確嗎? (y/N/q)
msgid "unable to display photo ID!\n"
msgstr "無法顯示照片 ID!\n"
- #: g10/pkclist.c:73 g10/revoke.c:758
++#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
msgstr "未指定原因"
- #: g10/pkclist.c:75 g10/revoke.c:760
++#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
msgstr "金鑰被代換了"
- #: g10/pkclist.c:77 g10/revoke.c:759
++#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
msgstr "金鑰已經被洩漏了"
- #: g10/pkclist.c:79 g10/revoke.c:761
++#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
msgstr "金鑰不再被使用了"
- #: g10/pkclist.c:81 g10/revoke.c:762
++#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
msgstr "使用者 ID 不再有效了"
- #: g10/pkclist.c:85
++#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "撤銷原因: "
- #: g10/pkclist.c:101
++#: g10/pkclist.c:100
msgid "revocation comment: "
msgstr "撤銷註釋: "
@@@ -5889,52 -4672,41 +5958,52 @@@
#. s = skip this key
#. q = quit
#.
- #: g10/pkclist.c:218
++#: g10/pkclist.c:217
msgid "iImMqQsS"
msgstr "iImMqQsS"
- #: g10/pkclist.c:226
++#: g10/pkclist.c:225
msgid "No trust value assigned to:\n"
msgstr "下列項目沒有對應的信任值:\n"
- #: g10/pkclist.c:259
++#: g10/pkclist.c:258
#, c-format
msgid " aka \"%s\"\n"
msgstr " 亦即 \"%s\"\n"
- #: g10/pkclist.c:269
++#: g10/pkclist.c:268
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr "你有多信任這把金鑰真的屬於叫這個名字的使用者?\n"
- #: g10/pkclist.c:284
++#: g10/pkclist.c:283
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = 我不知道或不想說\n"
- #: g10/pkclist.c:286
++#: g10/pkclist.c:285
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = 我*不*信任\n"
- #: g10/pkclist.c:292
++#: g10/pkclist.c:291
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = 我徹底信任\n"
- #: g10/pkclist.c:298
++#: g10/pkclist.c:297
msgid " m = back to the main menu\n"
msgstr " m = 回到主選單\n"
- #: g10/pkclist.c:301
++#: g10/pkclist.c:300
msgid " s = skip this key\n"
msgstr " s = 跳過這把金鑰\n"
- #: g10/pkclist.c:302
++#: g10/pkclist.c:301
msgid " q = quit\n"
msgstr " q = 離開\n"
- #: g10/pkclist.c:306
++#: g10/pkclist.c:305
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@@ -5943,37 -4715,29 +6012,37 @@@ msgstr "
"這把金鑰的最小信任等級為: %s\n"
"\n"
- #: g10/pkclist.c:312 g10/revoke.c:787
++#: g10/pkclist.c:311 g10/revoke.c:786
msgid "Your decision? "
msgstr "你的決定是甚麼? "
- #: g10/pkclist.c:333
++#: g10/pkclist.c:332
msgid "Do you really want to set this key to ultimate trust? (y/N) "
msgstr "請問你是否真的想把這把金鑰設成徹底信任呢? (y/N) "
- #: g10/pkclist.c:347
++#: g10/pkclist.c:346
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "被徹底信任金鑰的憑證:\n"
- #: g10/pkclist.c:436
++#: g10/pkclist.c:435
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr "%s: 沒法保證這把金鑰真的屬於叫這個名字的使用者\n"
- #: g10/pkclist.c:441
++#: g10/pkclist.c:440
#, c-format
msgid "%s: There is limited assurance this key belongs to the named user\n"
msgstr "%s: 祇能有限的保證這把金鑰真的屬於叫這個名字的使用者\n"
- #: g10/pkclist.c:447
++#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
- #: g10/pkclist.c:452
++#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "這把金鑰是屬於我們自己的\n"
- #: g10/pkclist.c:478
++#: g10/pkclist.c:477
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"
@@@ -5983,128 -4747,100 +6052,128 @@@ msgstr "
"除非你 **真的** 知道自己在做甚麼,\n"
"否則你最好在下一個問題回答 no\n"
- #: g10/pkclist.c:497
++#: g10/pkclist.c:496
msgid "Use this key anyway? (y/N) "
msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
- #: g10/pkclist.c:531
++#: g10/pkclist.c:546
msgid "WARNING: Using untrusted key!\n"
msgstr "警告: 正在使用不被信任的金鑰!\n"
- #: g10/pkclist.c:538
++#: g10/pkclist.c:553
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "警告: 這把金鑰可能已撤銷 (撤銷金鑰未出現)\n"
- #: g10/pkclist.c:547
++#: g10/pkclist.c:562
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n"
- #: g10/pkclist.c:550
++#: g10/pkclist.c:565
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "警告: 這把金鑰已被其持有人所撤銷!\n"
- #: g10/pkclist.c:551
++#: g10/pkclist.c:566
msgid " This could mean that the signature is forged.\n"
msgstr " 這很有可能表示此簽章是偽造的.\n"
- #: g10/pkclist.c:557
++#: g10/pkclist.c:572
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "警告: 這把子鑰已被其持有人所撤銷!\n"
- #: g10/pkclist.c:562
++#: g10/pkclist.c:577
msgid "Note: This key has been disabled.\n"
msgstr "請注意: 這把金鑰已停用.\n"
- #: g10/pkclist.c:582
++#: g10/pkclist.c:597
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
msgstr "請注意: 已驗證的簽署者地址為 '%s'\n"
- #: g10/pkclist.c:589
++#: g10/pkclist.c:604
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
msgstr "請注意: 簽署者地址 '%s' 與 DNS 項目並不吻合\n"
- #: g10/pkclist.c:601
++#: g10/pkclist.c:616
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "信任等級因有效的 PKA 資訊而調整為 *完全*\n"
- #: g10/pkclist.c:609
++#: g10/pkclist.c:624
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "信任等級因不良的 PKA 資訊而調整為 *永遠不會*\n"
- #: g10/pkclist.c:620
++#: g10/pkclist.c:635
msgid "Note: This key has expired!\n"
msgstr "請注意: 這把金鑰已經過期了!\n"
- #: g10/pkclist.c:631
++#: g10/pkclist.c:646
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
- #: g10/pkclist.c:633
++#: g10/pkclist.c:648
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " 沒有證據指出這個簽章屬於這個持有者.\n"
- #: g10/pkclist.c:641
++#: g10/pkclist.c:656
msgid "WARNING: We do NOT trust this key!\n"
msgstr "警告: 我們 *不* 信任這把金鑰!\n"
- #: g10/pkclist.c:642
++#: g10/pkclist.c:657
msgid " The signature is probably a FORGERY.\n"
msgstr " 這個簽章很有可能是 *偽造的*.\n"
- #: g10/pkclist.c:650
++#: g10/pkclist.c:665
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
- #: g10/pkclist.c:652
++#: g10/pkclist.c:667
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 這份簽章並不屬於這個持有者\n"
- #: g10/pkclist.c:809 g10/pkclist.c:827 g10/pkclist.c:1006 g10/pkclist.c:1048
++#: g10/pkclist.c:824 g10/pkclist.c:842 g10/pkclist.c:1021 g10/pkclist.c:1063
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: 已跳過: %s\n"
- #: g10/pkclist.c:838
++#: g10/pkclist.c:853
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: 已跳過: 公鑰已停用\n"
- #: g10/pkclist.c:857 g10/pkclist.c:1019
++#: g10/pkclist.c:872 g10/pkclist.c:1034
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳過: 公鑰已存在\n"
- #: g10/pkclist.c:943
++#: g10/pkclist.c:958
#, fuzzy, c-format
#| msgid "can't connect to '%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "無法連接至 '%s': %s\n"
- #: g10/pkclist.c:958
++#: g10/pkclist.c:973
#, fuzzy, c-format
#| msgid "line %d: invalid date given\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "第 %d 列: 無效的給定日期\n"
- #: g10/pkclist.c:965
++#: g10/pkclist.c:980
#, fuzzy, c-format
#| msgid "line %d: invalid date given\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "第 %d 列: 無效的給定日期\n"
- #: g10/pkclist.c:1068
++#: g10/pkclist.c:1083
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "你沒有指定使用者 ID. (你可能得用 \"-r\")\n"
- #: g10/pkclist.c:1092
++#: g10/pkclist.c:1107
msgid "Current recipients:\n"
msgstr "目前的收件者:\n"
- #: g10/pkclist.c:1118
++#: g10/pkclist.c:1133
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6112,162 -4848,126 +6181,162 @@@ msgstr "
"\n"
"請輸入使用者 ID. 以空白列結束: "
- #: g10/pkclist.c:1142
++#: g10/pkclist.c:1157
msgid "No such user ID.\n"
msgstr "沒有這個使用者 ID.\n"
- #: g10/pkclist.c:1153 g10/pkclist.c:1229
++#: g10/pkclist.c:1168 g10/pkclist.c:1244
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳過: 公鑰已經被設成預設收件者\n"
- #: g10/pkclist.c:1174
++#: g10/pkclist.c:1189
msgid "Public key is disabled.\n"
msgstr "公鑰已停用.\n"
- #: g10/pkclist.c:1184
++#: g10/pkclist.c:1199
msgid "skipped: public key already set\n"
msgstr "已跳過: 公鑰已設過\n"
- #: g10/pkclist.c:1219
++#: g10/pkclist.c:1234
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的預設收件者 \"%s\"\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1282
msgid "no valid addressees\n"
msgstr "沒有有效的地址\n"
- #: g10/pkclist.c:1597
++#: g10/pkclist.c:1612
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
- #: g10/pkclist.c:1622
++#: g10/pkclist.c:1637
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
- #: g10/plaintext.c:85
++#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
- #: g10/plaintext.c:592
++#: g10/plaintext.c:591
msgid "Detached signature.\n"
msgstr "分離的簽章.\n"
- #: g10/plaintext.c:600
++#: g10/plaintext.c:599
msgid "Please enter name of data file: "
msgstr "請輸入資料檔的名稱: "
- #: g10/plaintext.c:637
++#: g10/plaintext.c:636
msgid "reading stdin ...\n"
msgstr "正在讀取標準輸入中 ...\n"
- #: g10/plaintext.c:682
++#: g10/plaintext.c:681
msgid "no signed data\n"
msgstr "沒有被簽署過的資料\n"
- #: g10/plaintext.c:700
++#: g10/plaintext.c:699
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "無法開啟被簽署過的資料 '%s'\n"
- #: g10/plaintext.c:735
++#: g10/plaintext.c:734
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
- #: g10/pubkey-enc.c:117
++#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
- #: g10/pubkey-enc.c:124
++#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
msgstr "很好, 我們就是匿名收件者.\n"
- #: g10/pubkey-enc.c:283
++#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
msgstr "不支援舊式的 DEK 編碼\n"
- #: g10/pubkey-enc.c:311
++#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "%d%s 編密演算法未知或已停用\n"
- #: g10/pubkey-enc.c:353
++#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
- #: g10/pubkey-enc.c:378
++#: g10/pubkey-enc.c:377
#, c-format
msgid "Note: secret key %s expired at %s\n"
msgstr "請注意: 私鑰 %s 已於 %s 過期\n"
- #: g10/pubkey-enc.c:385
++#: g10/pubkey-enc.c:384
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:501
++#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
++#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet 失敗: %s\n"
- #: g10/revoke.c:145
++#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
msgstr "金鑰 %s 沒有使用者 ID\n"
- #: g10/revoke.c:313
++#: g10/revoke.c:312
msgid "To be revoked by:\n"
msgstr "將被撤銷:\n"
- #: g10/revoke.c:317
++#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
msgstr "(這是把機密的撤銷金鑰)\n"
- #: g10/revoke.c:323
++#: g10/revoke.c:322
#, fuzzy
#| msgid "Secret key is available.\n"
msgid "Secret key is not available.\n"
msgstr "私鑰可用.\n"
- #: g10/revoke.c:328
++#: g10/revoke.c:327
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
- #: g10/revoke.c:337 g10/revoke.c:728
++#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
- #: g10/revoke.c:353 g10/revoke.c:480
++#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet 失敗: %s\n"
- #: g10/revoke.c:416
++#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
msgstr "已建立撤銷憑證.\n"
- #: g10/revoke.c:422
++#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "這把 OpenPGP 金鑰有一份撤銷憑證."
- #: g10/revoke.c:568
++#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
"to retract such a revocation certificate once it has been published."
msgstr ""
- #: g10/revoke.c:571
++#: g10/revoke.c:570
#, fuzzy
#| msgid ""
#| "Use it to revoke this key in case of a compromise or loss of\n"
@@@ -6286,7 -4986,6 +6355,7 @@@ msgstr "
"辦法是產生一份新的撤銷憑證, 並且指明撤銷\n"
"的理由."
- #: g10/revoke.c:576
++#: g10/revoke.c:575
#, fuzzy
#| msgid ""
#| "To avoid an accidental use of this file, a colon has been inserted\n"
@@@ -6301,13 -5000,11 +6370,13 @@@ msgstr "
"真的要使用這份撤銷憑證前, 請先用文字編輯器把那個冒號移除,\n"
"撤銷憑證才能使用."
- #: g10/revoke.c:591
++#: g10/revoke.c:590
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "已建立撤銷憑證.\n"
- #: g10/revoke.c:635
++#: g10/revoke.c:634
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6316,22 -5013,18 +6385,22 @@@ msgstr "找不到私鑰 \"%s\": %s\n
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:662
++#: g10/revoke.c:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:689
++#: g10/revoke.c:688
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/revoke.c:712
++#: g10/revoke.c:711
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
- #: g10/revoke.c:736
++#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6350,89 -5043,71 +6419,89 @@@ msgstr "
"但是千萬小心: 你的機器上的列印系統可能會在列印過\n"
"程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
- #: g10/revoke.c:770
++#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
msgstr "請選擇撤銷的原因:\n"
- #: g10/revoke.c:780
++#: g10/revoke.c:779
msgid "Cancel"
msgstr "取消"
- #: g10/revoke.c:782
++#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(也許你會想要在這裡選擇 %d)\n"
- #: g10/revoke.c:823
++#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "請輸入選用的描述; 以空白列結束:\n"
- #: g10/revoke.c:851
++#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "撤銷原因: %s\n"
- #: g10/revoke.c:853
++#: g10/revoke.c:852
msgid "(No description given)\n"
msgstr "(沒有給定描述)\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "這樣可以嗎? (y/N) "
- #: g10/seskey.c:61 sm/encrypt.c:123
++#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
msgstr "建立了弱金鑰 - 重試中\n"
- #: g10/seskey.c:65
++#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
- #: g10/seskey.c:298
++#: g10/seskey.c:303
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "%s 金鑰 %s 使用不安全 (%zu 位元) 的雜湊\n"
- #: g10/seskey.c:316
++#: g10/seskey.c:321
#, c-format
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:114
++#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
msgstr "警告: 簽章摘要與訊息不一致\n"
- #: g10/sig-check.c:141
++#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
- #: g10/sig-check.c:143
++#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
msgstr "請參考 %s 上進一步的資訊\n"
- #: g10/sig-check.c:153
++#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
- #: g10/sig-check.c:275
++#: g10/sig-check.c:277
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
- #: g10/sig-check.c:284
++#: g10/sig-check.c:286
#, fuzzy, c-format
#| msgid "public key %s is %lu second newer than the signature\n"
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
- #: g10/sig-check.c:298 g10/sign.c:238
++#: g10/sig-check.c:300 g10/sign.c:237
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6443,7 -5118,6 +6512,7 @@@ msgid_plural "
msgstr[0] ""
"金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/sig-check.c:307
++#: g10/sig-check.c:309
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6453,92 -5127,74 +6522,92 @@@ msgid_plural "
msgstr[0] ""
"金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/sig-check.c:324
++#: g10/sig-check.c:326
#, c-format
msgid "Note: signature key %s expired %s\n"
msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
- #: g10/sig-check.c:335
++#: g10/sig-check.c:337
#, c-format
msgid "Note: signature key %s has been revoked\n"
msgstr "請注意: 簽章金鑰 %s 已遭撤銷\n"
- #: g10/sig-check.c:451
++#: g10/sig-check.c:471
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
- #: g10/sig-check.c:801
++#: g10/sig-check.c:1043
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
- #: g10/sig-check.c:836
++#: g10/sig-check.c:1046
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
- #: g10/sign.c:89
++#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr "警告: 註記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
- #: g10/sign.c:115
++#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
- #: g10/sign.c:138
++#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
- #: g10/sign.c:301
++#: g10/sign.c:300
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 簽章來自: \"%s\"\n"
- #: g10/sign.c:849
++#: g10/sign.c:848
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
- #: g10/sign.c:980
++#: g10/sign.c:979
msgid "signing:"
msgstr "簽署:"
- #: g10/sign.c:1256
++#: g10/sign.c:1255
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密將被採用\n"
- #: g10/skclist.c:156 g10/skclist.c:237
++#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
- #: g10/skclist.c:188
++#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "已跳過 \"%s\": 重複了\n"
- #: g10/skclist.c:207
++#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
msgstr "已跳過: 私鑰已經存在\n"
- #: g10/skclist.c:226
++#: g10/skclist.c:225
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
- #: g10/tdbdump.c:58 g10/trustdb.c:362
++#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
- #: g10/tdbdump.c:106
++#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
@@@ -6547,336 -5203,270 +6616,336 @@@ msgstr "
"# 相對應的信任值清單被建立於 %s\n"
"# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
- #: g10/tdbdump.c:163 g10/tdbdump.c:171 g10/tdbdump.c:176 g10/tdbdump.c:181
++#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, c-format
msgid "error in '%s': %s\n"
msgstr "在 '%s' 中出錯: %s\n"
- #: g10/tdbdump.c:163
++#: g10/tdbdump.c:162
msgid "line too long"
msgstr "列太長"
- #: g10/tdbdump.c:171
++#: g10/tdbdump.c:170
msgid "colon missing"
msgstr "冒號缺漏"
- #: g10/tdbdump.c:177
++#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "無效的指紋"
- #: g10/tdbdump.c:182
++#: g10/tdbdump.c:181
msgid "ownertrust value missing"
msgstr "主觀信任值缺漏"
- #: g10/tdbdump.c:218
++#: g10/tdbdump.c:217
#, c-format
msgid "error finding trust record in '%s': %s\n"
msgstr "在 '%s' 中尋找信任記錄時出錯: %s\n"
- #: g10/tdbdump.c:222
++#: g10/tdbdump.c:221
#, c-format
msgid "read error in '%s': %s\n"
msgstr "'%s' 讀取錯誤: %s\n"
- #: g10/tdbdump.c:231 g10/trustdb.c:377
++#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "信任資料庫: 同步化失敗: %s\n"
- #: g10/tdbio.c:141 sm/keydb.c:343
++#: g10/tdbio.c:140 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "無法為 '%s' 建立鎖定\n"
- #: g10/tdbio.c:146
++#: g10/tdbio.c:145
#, c-format
msgid "can't lock '%s'\n"
msgstr "無法鎖定 '%s'\n"
- #: g10/tdbio.c:205 g10/tdbio.c:1777
++#: g10/tdbio.c:204 g10/tdbio.c:1782
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
- #: g10/tdbio.c:213 g10/tdbio.c:1788
++#: g10/tdbio.c:212 g10/tdbio.c:1793
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
- #: g10/tdbio.c:352
++#: g10/tdbio.c:351
msgid "trustdb transaction too large\n"
msgstr "信任資料庫更動量過大\n"
- #: g10/tdbio.c:659 dirmngr/dirmngr.c:606
- #, c-format
- msgid "can't access '%s': %s\n"
- msgstr "無法存取 '%s': %s\n"
-
- #: g10/tdbio.c:688
++#: g10/tdbio.c:675
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: 目錄不存在!\n"
- #: g10/tdbio.c:711
++#: g10/tdbio.c:696 dirmngr/dirmngr.c:606
+ #, c-format
+ msgid "can't access '%s': %s\n"
+ msgstr "無法存取 '%s': %s\n"
+
++#: g10/tdbio.c:717
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: 建立版本記錄失敗: %s"
- #: g10/tdbio.c:716
++#: g10/tdbio.c:722
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: 建立了無效的信任資料庫\n"
- #: g10/tdbio.c:719
++#: g10/tdbio.c:725
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: 建立了信任資料庫\n"
- #: g10/tdbio.c:776
++#: g10/tdbio.c:781
msgid "Note: trustdb not writable\n"
msgstr "請注意: 信任資料庫不可寫入\n"
- #: g10/tdbio.c:785
++#: g10/tdbio.c:790
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: 無效的信任資料庫\n"
- #: g10/tdbio.c:822
++#: g10/tdbio.c:827
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: 建立雜湊表失敗: %s\n"
- #: g10/tdbio.c:830
++#: g10/tdbio.c:835
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: 更新版本記錄時錯誤: %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:1701 g10/tdbio.c:1730
++#: g10/tdbio.c:858 g10/tdbio.c:884 g10/tdbio.c:902 g10/tdbio.c:922
++#: g10/tdbio.c:957 g10/tdbio.c:1706 g10/tdbio.c:1735
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: 讀取版本記錄時錯誤: %s\n"
- #: g10/tdbio.c:926
++#: g10/tdbio.c:931
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: 寫入版本記錄時錯誤: %s\n"
- #: g10/tdbio.c:1451
++#: g10/tdbio.c:1456
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信任資料庫: 本機搜尋失敗: %s\n"
- #: g10/tdbio.c:1462
++#: g10/tdbio.c:1467
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
- #: g10/tdbio.c:1487
++#: g10/tdbio.c:1492
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: 不是一個信任資料庫檔案\n"
- #: g10/tdbio.c:1512
++#: g10/tdbio.c:1517
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1523
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: 無效的檔案版本 %d\n"
- #: g10/tdbio.c:1738
++#: g10/tdbio.c:1743
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
- #: g10/tdbio.c:1747
++#: g10/tdbio.c:1752
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: 寫入目錄記錄時出錯: %s\n"
- #: g10/tdbio.c:1758
++#: g10/tdbio.c:1763
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: 記錄歸零失敗: %s\n"
- #: g10/tdbio.c:1794
++#: g10/tdbio.c:1799
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: 附加記錄失敗: %s\n"
- #: g10/tdbio.c:1855
++#: g10/tdbio.c:1860
msgid "Error: The trustdb is corrupted.\n"
msgstr "錯誤: 信任資料庫已毀損.\n"
- #: g10/textfilter.c:147
++#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "無法處理長於 %d 字符的文字列\n"
- #: g10/textfilter.c:242
++#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
msgstr "輸入列比 %d 字符還長\n"
- #: g10/tofu.c:264 g10/tofu.c:283 g10/tofu.c:475
++#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
#, fuzzy, c-format
#| msgid "error sending standard options: %s\n"
msgid "error beginning transaction on TOFU database: %s\n"
msgstr "送出標準選項時出錯: %s\n"
- #: g10/tofu.c:318 g10/tofu.c:339 g10/tofu.c:665
++#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:369 g10/tofu.c:654
++#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
msgstr ""
- #: g10/tofu.c:451
++#: g10/tofu.c:512
#, fuzzy, c-format
#| msgid "unsupported algorithm: %s"
msgid "unsupported TOFU database version: %s\n"
msgstr "未支援的演算法: %s"
- #: g10/tofu.c:488 g10/tofu.c:1473 g10/tofu.c:1488 g10/tofu.c:1502
- #: g10/tofu.c:1514 g10/tofu.c:1725 g10/tofu.c:2340 g10/tofu.c:2629
++#: g10/tofu.c:549 g10/tofu.c:1515 g10/tofu.c:1530 g10/tofu.c:1542
++#: g10/tofu.c:1555 g10/tofu.c:1766 g10/tofu.c:2439 g10/tofu.c:2728
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/tofu.c:516 g10/tofu.c:524
++#: g10/tofu.c:577 g10/tofu.c:585
#, fuzzy, c-format
#| msgid "error writing base64 encoding: %s\n"
msgid "error determining TOFU database's version: %s\n"
msgstr "寫入 base64 編碼時出錯: %s\n"
- #: g10/tofu.c:537 g10/tofu.c:550 g10/tofu.c:611 g10/tofu.c:641
++#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
#, fuzzy, c-format
#| msgid "error initializing reader object: %s\n"
msgid "error initializing TOFU database: %s\n"
msgstr "啟始讀取程式物件時出錯: %s\n"
- #: g10/tofu.c:700
++#: g10/tofu.c:761
#, fuzzy, c-format
#| msgid "error opening '%s': %s\n"
msgid "error opening TOFU database '%s': %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
- #: g10/tofu.c:961
++#: g10/tofu.c:1023
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
msgstr ""
- #: g10/tofu.c:963
++#: g10/tofu.c:1025
msgid "Using split format for TOFU database\n"
msgstr ""
- #: g10/tofu.c:1196 g10/tofu.c:1223 g10/tofu.c:2675
++#: g10/tofu.c:1261 g10/tofu.c:1288 g10/tofu.c:2778
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/tofu.c:1625 g10/trustdb.c:748 g10/trustdb.c:1280
++#: g10/tofu.c:1666 g10/trustdb.c:748 g10/trustdb.c:1280
#, c-format
msgid "public key %s not found: %s\n"
msgstr "找不到公鑰 %s: %s\n"
- #: g10/tofu.c:1639 g10/tofu.c:1752 g10/tofu.c:1779
++#: g10/tofu.c:1680 g10/tofu.c:1793 g10/tofu.c:1820
#, fuzzy, c-format
#| msgid "error setting OCSP target: %s\n"
msgid "error setting TOFU binding's trust level to %s\n"
msgstr "設定 OCSP 目標時出錯: %s\n"
- #: g10/tofu.c:1821
++#: g10/tofu.c:1870
#, c-format
msgid "The binding %s is NOT known."
msgstr ""
- #: g10/tofu.c:1832
++#: g10/tofu.c:1880
#, c-format
msgid ""
- "The key %s raised a conflict with this binding (%s). Since this binding's "
- "policy was 'auto', it was changed to 'ask'."
+ "The key with fingerprint %s raised a conflict with the binding %s. Since "
+ "this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
- #: g10/tofu.c:1843
++#: g10/tofu.c:1892
#, c-format
msgid ""
"Please indicate whether you believe the binding %s%sis legitimate (the key "
"belongs to the stated owner) or a forgery (bad)."
msgstr ""
- #: g10/tofu.c:1876
++#: g10/tofu.c:1937
#, fuzzy, c-format
#| msgid "error getting responder ID: %s\n"
msgid "error gathering other user IDs: %s\n"
msgstr "取得回應程式 ID 時出錯: %s\n"
- #: g10/tofu.c:1887
++#: g10/tofu.c:1948
msgid "Known user IDs associated with this key:\n"
msgstr ""
- #: g10/tofu.c:1906 g10/tofu.c:1999
++#: g10/tofu.c:1967 g10/tofu.c:2060 g10/tofu.c:2531
#, fuzzy, c-format
#| msgid "validity: %s"
msgid "policy: %s"
msgstr "有效性: %s"
- #: g10/tofu.c:1957
++#: g10/tofu.c:2018
#, fuzzy, c-format
#| msgid "error getting stored flags: %s\n"
msgid "error gathering signature stats: %s\n"
msgstr "取得已存放的旗標時出錯: %s\n"
- #: g10/tofu.c:1961
++#: g10/tofu.c:2022
#, c-format
msgid "The email address \"%s\" is associated with %d key:\n"
msgid_plural "The email address \"%s\" is associated with %d keys:\n"
msgstr[0] ""
- #: g10/tofu.c:1984
++#: g10/tofu.c:2045
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
- #: g10/tofu.c:1997
++#: g10/tofu.c:2058
#, fuzzy
#| msgid "list keys"
msgid "this key"
msgstr "列出金鑰"
- #: g10/tofu.c:2007
++#: g10/tofu.c:2068
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
msgstr[0] ""
- #: g10/tofu.c:2016
++#: g10/tofu.c:2077
#, fuzzy, c-format
#| msgid "print message digests"
msgid "%ld message signed"
msgid_plural "%ld messages signed"
msgstr[0] "印出訊息摘要"
- #: g10/tofu.c:2022
++#: g10/tofu.c:2083
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
msgstr[0] ""
- #: g10/tofu.c:2026
++#: g10/tofu.c:2087
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
msgstr[0] ""
- #: g10/tofu.c:2030
++#: g10/tofu.c:2091
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -6885,166 -5475,147 +6954,178 @@@ msgstr[0] "
#. TRANSLATORS: Please translate the text found in the source
#. file below. We don't directly internationalize that text
#. so that we can tweak it without breaking translations.
- #: g10/tofu.c:2043
++#: g10/tofu.c:2104
msgid "TOFU detected a binding conflict"
msgstr ""
#. TRANSLATORS: Two letters (normally the lower and upper case
#. version of the hotkey) for each of the five choices. If
#. there is only one choice in your language, repeat it.
- #: g10/tofu.c:2078
++#: g10/tofu.c:2140
msgid "gGaAuUrRbB"
msgstr ""
- #: g10/tofu.c:2084
++#: g10/tofu.c:2146
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
msgstr ""
- #: g10/tofu.c:2162
++#: g10/tofu.c:2224
#, fuzzy, c-format
#| msgid "error creating a pipe: %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "建立管道時出錯: %s\n"
- #: g10/tofu.c:2252
+ #. TRANSLATORS: The tilde ('~') is used here to indicate a
+ #. * non-breakable space
++#: g10/tofu.c:2317
#, c-format
- msgid "%d year"
- msgid_plural "%d years"
+ msgid "%d~year"
+ msgid_plural "%d~years"
msgstr[0] ""
- #: g10/tofu.c:2261
++#: g10/tofu.c:2326
#, c-format
- msgid "%d month"
- msgid_plural "%d months"
+ msgid "%d~month"
+ msgid_plural "%d~months"
msgstr[0] ""
- #: g10/tofu.c:2270
++#: g10/tofu.c:2335
#, c-format
- msgid "%d day"
- msgid_plural "%d days"
+ msgid "%d~day"
+ msgid_plural "%d~days"
msgstr[0] ""
- #: g10/tofu.c:2279
++#: g10/tofu.c:2344
#, c-format
- msgid "%d hour"
- msgid_plural "%d hours"
+ msgid "%d~hour"
+ msgid_plural "%d~hours"
msgstr[0] ""
- #: g10/tofu.c:2288
++#: g10/tofu.c:2353
#, c-format
- msgid "%d minute"
- msgid_plural "%d minutes"
+ msgid "%d~minute"
+ msgid_plural "%d~minutes"
msgstr[0] ""
- #: g10/tofu.c:2297
++#: g10/tofu.c:2362
#, c-format
- msgid "%d second"
- msgid_plural "%d seconds"
+ msgid "%d~second"
+ msgid_plural "%d~seconds"
msgstr[0] ""
- #: g10/tofu.c:2347
++#: g10/tofu.c:2450
#, c-format
msgid "Have never verified a message signed by key %s!\n"
msgstr ""
- #: g10/tofu.c:2400
++#: g10/tofu.c:2479
#, c-format
- msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+ msgid ""
+ "Failed to collect signature statistics for \"%s\"\n"
+ "(key %s)\n"
msgstr ""
- #: g10/tofu.c:2415
- #, c-format
- msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
- msgstr ""
++#: g10/tofu.c:2499
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %ld messages signed by \"%s\"."
+ msgstr "印出訊息摘要"
- #. TRANSLATORS: The final %s is replaced by a string like
- #. "7 months, 1 day, 5 minutes, 0 seconds".
- #: g10/tofu.c:2427
++#: g10/tofu.c:2510
#, c-format
msgid ""
- "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld message signed by \"%s\"\n"
+ "in the past %s."
msgid_plural ""
- "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+ "Verified %ld messages signed by \"%s\"\n"
+ "in the past %s."
msgstr[0] ""
- #: g10/tofu.c:2440
++#: g10/tofu.c:2521
#, c-format
msgid "The most recent message was verified %s ago."
msgstr ""
- #: g10/tofu.c:2462
++#: g10/tofu.c:2566
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
- #: g10/tofu.c:2465
++#: g10/tofu.c:2569
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
- #. TRANSLATORS: translate the below text. We don't
- #. directly internationalize that text so that we can
- #. tweak it without breaking translations.
- #: g10/tofu.c:2473
++#: g10/tofu.c:2577
#, c-format
- msgid "TOFU: few signatures %d message %s"
- msgid_plural "TOFU: few signatures %d messages %s"
+ msgid ""
+ "Warning: if you think you've seen more than %ld message signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
+ msgid_plural ""
+ "Warning: if you think you've seen more than %ld messages signed by this key, "
+ "then this key might be a forgery! Carefully examine the email address for "
+ "small variations. If the key is suspect, then use\n"
+ " %s\n"
+ "to mark it as being bad.\n"
msgstr[0] ""
- #: g10/tofu.c:2568 g10/tofu.c:2602 g10/tofu.c:2782 g10/tofu.c:2835
- #: g10/tofu.c:2915
++#: g10/tofu.c:2667 g10/tofu.c:2701 g10/tofu.c:2898 g10/tofu.c:2951
++#: g10/tofu.c:3031
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/trustdb.c:216
++#: g10/trustdb.c:215
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "'%s' 不是有效的長式金鑰 ID\n"
- #: g10/trustdb.c:242
++#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
- #: g10/trustdb.c:280
++#: g10/trustdb.c:279
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
- #: g10/trustdb.c:295
++#: g10/trustdb.c:294
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
- #: g10/trustdb.c:305
++#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "金鑰 %s 已標記成徹底信任了\n"
- #: g10/trustdb.c:341
++#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
- #: g10/trustdb.c:347
++#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
- #: g10/trustdb.c:422
++#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr "你可以試著用下列指令來重建信任資料庫:\n"
- #: g10/trustdb.c:431
++#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
msgstr "如果行不通的話, 請查閱手冊\n"
- #: g10/trustdb.c:468
++#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
- #: g10/trustdb.c:474
++#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
msgstr "正在使用 %s 信任模型\n"
@@@ -7053,7 -5623,6 +7134,7 @@@
msgid "no need for a trustdb check\n"
msgstr "不需要檢查信任資料庫\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2123
++#: g10/trustdb.c:516 g10/trustdb.c:2127
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@@ -7099,36 -5660,29 +7180,36 @@@ msgstr "沒有找到任何徹底信任�
msgid "public key of ultimately trusted key %s not found\n"
msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
- #: g10/trustdb.c:2051
++#: g10/trustdb.c:2054
#, 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:2130
++#: g10/trustdb.c:2134
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
- #: g10/trust.c:106
++#: g10/trust.c:105
msgid "undefined"
msgstr ""
- #: g10/trust.c:107
++#: g10/trust.c:106
#, fuzzy
#| msgid "never "
msgid "never"
msgstr "永遠不過期"
- #: g10/trust.c:108
++#: g10/trust.c:107
msgid "marginal"
msgstr ""
- #: g10/trust.c:109
++#: g10/trust.c:108
msgid "full"
msgstr ""
- #: g10/trust.c:110
++#: g10/trust.c:109
msgid "ultimate"
msgstr ""
@@@ -7140,45 -5694,36 +7221,45 @@@
#. 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
++#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
msgstr ""
- #: g10/trust.c:150
++#: g10/trust.c:149
#, fuzzy
#| msgid "revoked"
msgid "[ revoked]"
msgstr "已撤銷"
- #: g10/trust.c:152 g10/trust.c:158
++#: g10/trust.c:151 g10/trust.c:157
#, fuzzy
#| msgid "expired"
msgid "[ expired]"
msgstr "已過期"
- #: g10/trust.c:157
++#: g10/trust.c:156
#, fuzzy
#| msgid "unknown"
msgid "[ unknown]"
msgstr "未知"
- #: g10/trust.c:159
++#: g10/trust.c:158
msgid "[ undef ]"
msgstr ""
- #: g10/trust.c:160
++#: g10/trust.c:159
msgid "[marginal]"
msgstr ""
- #: g10/trust.c:161
++#: g10/trust.c:160
msgid "[ full ]"
msgstr ""
- #: g10/trust.c:162
++#: g10/trust.c:161
msgid "[ultimate]"
msgstr ""
- #: g10/verify.c:118
++#: g10/verify.c:117
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@@ -7188,12 -5733,10 +7269,12 @@@ msgstr "
"請記住簽章檔 (.sig 或 .asc)\n"
"應該是第一個命令列給定的檔案.\n"
- #: g10/verify.c:205
++#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
- #: g10/verify.c:254
++#: g10/verify.c:253
#, c-format
msgid "can't open fd %d: %s\n"
msgstr "無法開啟 fd %d: %s\n"
@@@ -7506,7 -5981,6 +7587,7 @@@ msgstr "|N|開始新增個人識別碼
msgid "run in multi server mode (foreground)"
msgstr "以多重伺服器模式執行 (前景)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:328 dirmngr/dirmngr.c:177
++#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|等級|設定除錯等級為指定等級"
@@@ -7645,9 -6089,6 +7726,9 @@@ msgstr "吻合的憑證數量: %d\n
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1115 sm/keydb.c:1201
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
msgstr "配置 keyDB 代號失敗\n"
@@@ -8127,7 -6463,6 +8208,7 @@@ msgstr "(這看起來不像是個加密
msgid "certificate '%s' not found: %s\n"
msgstr "找不到憑證 '%s': %s\n"
- #: sm/delete.c:122 sm/keydb.c:1211 sm/keydb.c:1309
++#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
#, c-format
msgid "error locking keybox: %s\n"
msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"
@@@ -8151,123 -6482,93 +8232,123 @@@ msgstr "刪除憑證 \"%s\" 時失敗:
msgid "no valid recipients given\n"
msgstr "沒有給定有效的收件者\n"
- #: sm/gpgsm.c:204
++#: sm/gpgsm.c:207
msgid "list external keys"
msgstr "列出外部金鑰"
- #: sm/gpgsm.c:206
++#: sm/gpgsm.c:209
msgid "list certificate chain"
msgstr "列出憑證鏈"
- #: sm/gpgsm.c:213
++#: sm/gpgsm.c:216
msgid "import certificates"
msgstr "匯入憑證"
- #: sm/gpgsm.c:214
++#: sm/gpgsm.c:217
msgid "export certificates"
msgstr "匯出憑證"
- #: sm/gpgsm.c:222
++#: sm/gpgsm.c:225
msgid "register a smartcard"
msgstr "註冊智慧卡"
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
msgstr "將指令遞送給 dirmngr"
- #: sm/gpgsm.c:227
++#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
msgstr "叫用 gpg-protect-tool"
- #: sm/gpgsm.c:243
++#: sm/gpgsm.c:246
msgid "create base-64 encoded output"
msgstr "建立以 base-64 編碼過的輸出"
- #: sm/gpgsm.c:248
++#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
msgstr "假設輸入的是 PEM 格式"
- #: sm/gpgsm.c:250
++#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
msgstr "假設輸入的是 base-64 格式"
- #: sm/gpgsm.c:252
++#: sm/gpgsm.c:258
msgid "assume input is in binary format"
msgstr "假設輸入的是二進制格式"
- #: sm/gpgsm.c:259
++#: sm/gpgsm.c:265
msgid "never consult a CRL"
msgstr "永遠不要查閱 CRL"
- #: sm/gpgsm.c:269
++#: sm/gpgsm.c:275
msgid "check validity using OCSP"
msgstr "用 OCSP 檢查有效性"
- #: sm/gpgsm.c:274
++#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
msgstr "|N|要包含的憑證數量"
- #: sm/gpgsm.c:277
++#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
msgstr "|檔案|從指定檔案中取得原則資訊"
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "不要檢查憑證原則"
- #: sm/gpgsm.c:284
++#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
msgstr "取回遺失的發行者憑證"
- #: sm/gpgsm.c:295
++#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
msgstr "完全不要使用終端機"
- #: sm/gpgsm.c:297
++#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
- #: sm/gpgsm.c:302
++#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
msgstr "|檔案|將稽核日誌寫入至指定檔案"
- #: sm/gpgsm.c:305
++#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "批次模式: 永遠不詢問"
- #: sm/gpgsm.c:306
++#: sm/gpgsm.c:312
msgid "assume yes on most questions"
msgstr "假設大部分的問題都回答是"
- #: sm/gpgsm.c:307
++#: sm/gpgsm.c:313
msgid "assume no on most questions"
msgstr "假設大部分的問題都回答否"
- #: sm/gpgsm.c:310
++#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
- #: sm/gpgsm.c:323 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
- #: sm/gpgsm.c:341
++#: sm/gpgsm.c:346
msgid "|NAME|use cipher algorithm NAME"
msgstr "|名稱|使用指定名稱的編密演算法"
- #: sm/gpgsm.c:343
++#: sm/gpgsm.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|名稱|使用指定名稱的訊息摘要演算法"
- #: sm/gpgsm.c:559
++#: sm/gpgsm.c:564
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
msgstr "用法: @GPGSM@ [選項] [檔案] (或用 -h 求助)"
- #: sm/gpgsm.c:562
++#: sm/gpgsm.c:567
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8277,46 -6578,37 +8358,46 @@@ msgstr "
"用 S/MIME 協定來簽署, 檢查, 加密, 解密\n"
"預設的操作會依輸入資料而定\n"
- #: sm/gpgsm.c:766
++#: sm/gpgsm.c:771
#, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
msgstr "請注意: 將無法加密為 '%s': %s\n"
- #: sm/gpgsm.c:777
++#: sm/gpgsm.c:782
#, c-format
msgid "unknown validation model '%s'\n"
msgstr "未知的驗證模型 '%s'\n"
- #: sm/gpgsm.c:828 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: 沒有給定主機名稱\n"
- #: sm/gpgsm.c:847 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: 給定的密碼沒有使用者\n"
- #: sm/gpgsm.c:868 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: 正在跳過這一列\n"
- #: sm/gpgsm.c:1420
++#: sm/gpgsm.c:1434
msgid "could not parse keyserver\n"
msgstr "無法剖析金鑰伺服器\n"
- #: sm/gpgsm.c:1614
++#: sm/gpgsm.c:1631
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "正在匯入通用憑證 '%s'\n"
- #: sm/gpgsm.c:1655
++#: sm/gpgsm.c:1672
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "無法用 '%s' 來簽署: %s\n"
- #: sm/gpgsm.c:2011
++#: sm/gpgsm.c:2028
msgid "invalid command (there is no implicit command)\n"
msgstr "無效的指令 (沒有這樣的指令)\n"
@@@ -8333,7 -6622,6 +8414,7 @@@ msgstr "存放憑證時出錯\n
msgid "basic certificate checks failed - not imported\n"
msgstr "基本的憑證檢查失敗了 - 未匯入\n"
- #: sm/import.c:467 sm/keydb.c:1231 sm/keydb.c:1321
++#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "取得已存放的旗標時出錯: %s\n"
@@@ -8348,31 -6634,25 +8429,31 @@@ msgstr "匯入憑證時出錯: %s\n
msgid "error reading input: %s\n"
msgstr "讀取輸入時出錯: %s\n"
- #: sm/keydb.c:1108 sm/keydb.c:1194
++#: sm/keydb.c:1120 sm/keydb.c:1206
msgid "failed to get the fingerprint\n"
msgstr "取得指紋失敗\n"
- #: sm/keydb.c:1150
++#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr "查找既有憑證的問題: %s\n"
- #: sm/keydb.c:1162
++#: sm/keydb.c:1174
#, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "尋找可寫入的 keyDB 時出錯: %s\n"
- #: sm/keydb.c:1170
++#: sm/keydb.c:1182
#, c-format
msgid "error storing certificate: %s\n"
msgstr "存放憑證時出錯: %s\n"
- #: sm/keydb.c:1222
++#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr "重新搜尋憑證的問題: %s\n"
- #: sm/keydb.c:1243 sm/keydb.c:1332
++#: sm/keydb.c:1255 sm/keydb.c:1344
#, c-format
msgid "error storing flags: %s\n"
msgstr "存放旗標時出錯: %s\n"
@@@ -8551,7 -6798,6 +8632,7 @@@ msgstr "固定載入的憑證: %u\n
msgid " runtime cached certificates: %u\n"
msgstr " 執行時期快取的憑證: %u\n"
- #: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:380
++#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:386
msgid "certificate already cached\n"
msgstr "憑證早已快取\n"
@@@ -8559,8 -6804,6 +8640,8 @@@
msgid "certificate cached\n"
msgstr "憑證已快取\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
- #: dirmngr/dirmngr-client.c:384
++#: dirmngr/dirmngr-client.c:390
#, c-format
msgid "error caching certificate: %s\n"
msgstr "快取憑證時出錯: %s\n"
@@@ -9143,11 -7263,9 +9224,11 @@@ msgstr "預期憑證應為 PEM 格式
msgid "force the use of the default OCSP responder"
msgstr "強制使用預設的 OCSP 回應程式"
- #: dirmngr/dirmngr-client.c:150
++#: dirmngr/dirmngr-client.c:169
msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
msgstr "用法: dirmngr-client [選項] [憑證檔案|模式](或用 -h 求助)\n"
- #: dirmngr/dirmngr-client.c:154
++#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9159,77 -7277,61 +9240,77 @@@ msgstr "
"如果憑證有效, 此程序將傳回 0; 如果憑證無效\n"
"則傳回 1; 其他錯誤代碼則代表不同的一般性失敗\n"
- #: dirmngr/dirmngr-client.c:268 dirmngr/dirmngr-client.c:888
++#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:905
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr "從標準輸入讀取憑證時出錯: %s\n"
- #: dirmngr/dirmngr-client.c:275
++#: dirmngr/dirmngr-client.c:281
#, c-format
msgid "error reading certificate from '%s': %s\n"
msgstr "從 '%s' 讀取憑證時出錯: %s\n"
- #: dirmngr/dirmngr-client.c:289
++#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
msgstr "憑證大到全然不合理的境界\n"
- #: dirmngr/dirmngr-client.c:305
++#: dirmngr/dirmngr-client.c:311
#, c-format
msgid "can't connect to the dirmngr: %s\n"
msgstr "無法連接至 dirmngr: %s\n"
- #: dirmngr/dirmngr-client.c:327
++#: dirmngr/dirmngr-client.c:333
#, c-format
msgid "lookup failed: %s\n"
msgstr "查找失敗: %s\n"
- #: dirmngr/dirmngr-client.c:342
++#: dirmngr/dirmngr-client.c:348
#, c-format
msgid "loading CRL '%s' failed: %s\n"
msgstr "載入 CRL '%s' 時失敗: %s\n"
- #: dirmngr/dirmngr-client.c:370
++#: dirmngr/dirmngr-client.c:376
msgid "a dirmngr daemon is up and running\n"
msgstr "有個 dirmngr 服務已啟動並正在執行中\n"
- #: dirmngr/dirmngr-client.c:392
++#: dirmngr/dirmngr-client.c:398
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr "憑證之驗證失敗: %s\n"
- #: dirmngr/dirmngr-client.c:399 dirmngr/dirmngr-client.c:899
++#: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:916
msgid "certificate is valid\n"
msgstr "憑證有效\n"
- #: dirmngr/dirmngr-client.c:405 dirmngr/dirmngr-client.c:907
++#: dirmngr/dirmngr-client.c:411 dirmngr/dirmngr-client.c:924
msgid "certificate has been revoked\n"
msgstr "憑證已遭撤銷\n"
- #: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:909
++#: dirmngr/dirmngr-client.c:416 dirmngr/dirmngr-client.c:926
#, c-format
msgid "certificate check failed: %s\n"
msgstr "憑證檢查失敗: %s\n"
- #: dirmngr/dirmngr-client.c:423
++#: dirmngr/dirmngr-client.c:429
#, c-format
msgid "got status: '%s'\n"
msgstr "得到狀態: '%s'\n"
- #: dirmngr/dirmngr-client.c:438
++#: dirmngr/dirmngr-client.c:444
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr "寫入 base64 編碼時出錯: %s\n"
- #: dirmngr/dirmngr-client.c:685
++#: dirmngr/dirmngr-client.c:702
#, c-format
msgid "unsupported inquiry '%s'\n"
msgstr "未支援的查詢 '%s'\n"
- #: dirmngr/dirmngr-client.c:787
++#: dirmngr/dirmngr-client.c:804
msgid "absolute file name expected\n"
msgstr "應該要有絕對檔名\n"
- #: dirmngr/dirmngr-client.c:832
++#: dirmngr/dirmngr-client.c:849
#, c-format
msgid "looking up '%s'\n"
msgstr "正在查找 '%s'\n"
@@@ -9375,12 -7443,10 +9456,12 @@@ msgstr "用法: %s [選項]
msgid "colons are not allowed in the socket name\n"
msgstr "socket 名稱內不允許使用冒號\n"
- #: dirmngr/dirmngr.c:1360 dirmngr/server.c:1535
++#: dirmngr/dirmngr.c:1360 dirmngr/server.c:1533
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
- #: dirmngr/dirmngr.c:1366 dirmngr/server.c:1541
++#: dirmngr/dirmngr.c:1366 dirmngr/server.c:1539
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
@@@ -9857,76 -7821,60 +9938,76 @@@ msgstr "OCSP 回應程式傳回非當�
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP 回應程式傳回老舊的狀態\n"
- #: dirmngr/server.c:429 dirmngr/server.c:541 dirmngr/server.c:587
++#: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) 失敗: %s\n"
- #: dirmngr/server.c:888
++#: dirmngr/server.c:886
msgid "ldapserver missing"
msgstr "遺失 ldapserver"
- #: dirmngr/server.c:962
++#: dirmngr/server.c:960
msgid "serialno missing in cert ID"
msgstr "憑證 ID 中遺失 serialno"
- #: dirmngr/server.c:1098 dirmngr/server.c:1184 dirmngr/server.c:1620
- #: dirmngr/server.c:1671 dirmngr/server.c:2151 dirmngr/server.c:2167
++#: dirmngr/server.c:1096 dirmngr/server.c:1182 dirmngr/server.c:1618
++#: dirmngr/server.c:1669 dirmngr/server.c:2149 dirmngr/server.c:2165
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire 失敗: %s\n"
- #: dirmngr/server.c:1227
++#: dirmngr/server.c:1225
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url 失敗: %s\n"
- #: dirmngr/server.c:1239 dirmngr/server.c:1270 dirmngr/server.c:1429
++#: dirmngr/server.c:1237 dirmngr/server.c:1268 dirmngr/server.c:1427
#, c-format
msgid "error sending data: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: dirmngr/server.c:1377
++#: dirmngr/server.c:1375
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch 失敗: %s\n"
- #: dirmngr/server.c:1410
++#: dirmngr/server.c:1408
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert 失敗: %s\n"
- #: dirmngr/server.c:1437
++#: dirmngr/server.c:1435
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d 已超出\n"
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2397
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "無法配置控制結構: %s\n"
- #: dirmngr/server.c:2409
++#: dirmngr/server.c:2408
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "配置 assuan 脈絡失敗: %s\n"
- #: dirmngr/server.c:2430
++#: dirmngr/server.c:2429
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "伺服器啟始失敗: %s\n"
- #: dirmngr/server.c:2438
++#: dirmngr/server.c:2437
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "向 Assuan 註冊指令時失敗: %s\n"
- #: dirmngr/server.c:2478
++#: dirmngr/server.c:2477
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan 接受問題: %s\n"
- #: dirmngr/server.c:2497
++#: dirmngr/server.c:2496
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan 處理時失敗: %s\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list